test: host-spelled fixture path in 772, build-directory words excluded from 765 (c), cmd.exe quoting in 775

Author: speak-agent

tests/e2e/765_a_consumer_include_directory_stays_in_the_consumer.sh

@@ -159,8 +159,14 @@ def words(root):
     for e in entries(root):
         f = norm(e["file"]).split("/")[-1]
         if f not in ("dep.cpp", "dep_c.c"): continue
+        # A word naming the root's own build directory (clang's
+        # `-fprebuilt-module-path=`, MSVC's `/ifcSearchDir`) is where that
+        # project keeps its BMIs, not an input the dependency is compiled
+        # against, and it differs between two projects by construction.
+        own = f"/{root}/target/"
         out[f] = sorted(norm(x) for x in args(e)
-                        if x.startswith(("-I", "-D", "-f", "-idirafter", "/I", "/D")))
+                        if x.startswith(("-I", "-D", "-f", "-idirafter", "/I", "/D"))
+                        and own not in norm(x))
     return out
 w1, w2 = words("app"), words("app2")
 if not w1 or w1 != w2:

tests/e2e/772_a_published_member_is_self_contained.sh

@@ -30,6 +30,8 @@ TMP=$(mktemp -d)
 trap "rm -rf $TMP" EXIT
 export MCPP_HOME="$TMP/mcpp-home"
 source "$(dirname "$0")/_inherit_toolchain.sh"
+source "$(dirname "$0")/_host_path.sh"
+TMP_HOST="$(host_path "$TMP")"
 
 fail() { echo "FAIL: $*"; exit 1; }
 
@@ -132,7 +134,7 @@ name    = "app"
 version = "0.1.0"
 
 [dependencies]
-"probe.util" = { path = "$TMP/unpacked/util-0.3.0" }
+"probe.util" = { path = "$TMP_HOST/unpacked/util-0.3.0" }
 
 [targets.app]
 kind = "bin"

tests/e2e/775_a_host_tool_merges_its_conditional_sections_once.sh

@@ -65,6 +65,11 @@ int main() {
     if (!tool || !*tool) return 1;
     std::string out = std::string(mcpp::out_dir()) + "/gen.cpp";
     std::string cmd = std::string("\"") + tool + "\" \"" + out + "\"";
+#ifdef _WIN32
+    // cmd.exe removes the first and the last quote of a command that starts
+    // with one; the outer pair keeps both inner pairs intact.
+    cmd = "\"" + cmd + "\"";
+#endif
     if (std::system(cmd.c_str()) != 0) return 1;
     mcpp::generated(out.c_str());
 }
@@ -73,7 +78,11 @@ EOF
 ( cd "$TMP/toolpkg" && "$MCPP" build > "$TMP/direct.log" 2>&1 ) \
     || fail "control: the tool package does not build on its own" "$TMP/direct.log"
 cd "$TMP/app"
-"$MCPP" build > build.log 2>&1 || fail "the host tool received a conditional entry twice" build.log
+"$MCPP" build > build.log 2>&1 || {
+    grep -q "redefinition" build.log \
+        && fail "the host tool received a conditional entry twice" build.log
+    fail "the consumer did not build" build.log
+}
 "$MCPP" run > run.log 2>&1 || fail "the program did not run" run.log
 grep -q '^ANSWER=41' run.log || fail "wrong answer" run.log
 echo "PASS: 775_a_host_tool_merges_its_conditional_sections_once"