tests: the new fixtures write host spellings into the manifests they generate

`00_fixture_path_hygiene.sh` caught three of them: 873 and 874 interpolated `$work`
into a `[build-dependencies]` path, and 875 wrote the toolchain root, the linker
wrapper and a driver straight from shell variables. MSYS rewrites paths in argv
and the environment but not in file content, so on Windows a native mcpp would
read `/d/a/...` and resolve it against the current drive -- the failure the
helper's own header records costing a day. Each path now goes through
`host_path`, and the assertions that compare mcpp's output compare host
spellings too.

Author: speak-agent

tests/e2e/873_payload_overrides.sh

@@ -13,6 +13,9 @@ set -e
 
 MCPP="${MCPP:-mcpp}"
 work="$(mktemp -d)"
+# A path written INTO a manifest goes through host_path (see _host_path.sh).
+source "$(dirname "$0")/_host_path.sh"
+work_HOST="$(host_path "$work")"
 trap 'rm -rf "$work"' EXIT
 export NO_COLOR=1
 
@@ -48,7 +51,7 @@ name    = "app"
 version = "0.1.0"
 
 [build-dependencies.e2e]
-plug = { path = "$work/plug", features = ["tools-x"], host-module = true }
+plug = { path = "$work_HOST/plug", features = ["tools-x"], host-module = true }
 
 [targets.app]
 kind = "bin"
@@ -83,9 +86,9 @@ grep -q "mcpp-e2e-absent-tool" <<<"$out" || fail "the refusal does not name the
 # The environment variable.
 out="$(MCPP_XLINGS_OVERRIDE_XIM_MCPP_E2E_ABSENT_TOOL="$work/opt/bin/absent-tool" probe build)"
 grep -q "Finished" <<<"$out" || fail "an env override still needed the payload"
-grep -q "Using xim:mcpp-e2e-absent-tool ← $work/opt/bin/absent-tool  \[custom · env MCPP_XLINGS_OVERRIDE_XIM_MCPP_E2E_ABSENT_TOOL\]" <<<"$out" \
+grep -q "Using xim:mcpp-e2e-absent-tool ← $work_HOST/opt/bin/absent-tool  \[custom · env MCPP_XLINGS_OVERRIDE_XIM_MCPP_E2E_ABSENT_TOOL\]" <<<"$out" \
     || fail "no Using line naming the env override"
-grep -q "dir=$work/opt source=override program=$work/opt/bin/absent-tool" <<<"$out" \
+grep -q "dir=$work_HOST/opt source=override program=$work_HOST/opt/bin/absent-tool" <<<"$out" \
     || fail "the build program did not receive the override (root, source, program)"
 grep -q "Finished .* · custom: xim:mcpp-e2e-absent-tool" <<<"$out" || fail "Finished does not summarise the source"
 

tests/e2e/874_payload_on_request.sh

@@ -11,6 +11,9 @@ set -e
 
 MCPP="${MCPP:-mcpp}"
 work="$(mktemp -d)"
+# A path written INTO a manifest goes through host_path (see _host_path.sh).
+source "$(dirname "$0")/_host_path.sh"
+work_HOST="$(host_path "$work")"
 trap 'rm -rf "$work"' EXIT
 export NO_COLOR=1
 
@@ -44,7 +47,7 @@ name    = "app"
 version = "0.1.0"
 
 [build-dependencies.e2e]
-plug = { path = "$work/plug", features = ["tools-x"], host-module = true }
+plug = { path = "$work_HOST/plug", features = ["tools-x"], host-module = true }
 
 [targets.app]
 kind = "bin"

tests/e2e/875_toolchain_by_path.sh

@@ -16,10 +16,13 @@ if [[ ! -x "$LLVM_ROOT/bin/clang++" ]]; then
     echo "SKIP: no llvm payload installed ($LLVM_ROOT)"; exit 0
 fi
 work="$(mktemp -d)"
+# Paths written INTO a manifest go through host_path (see _host_path.sh).
+source "$(dirname "$0")/_host_path.sh"
 trap 'rm -rf "$work"' EXIT
 export NO_COLOR=1
 
 T="$work/llvm"
+T_HOST="$(host_path "$T")"
 mkdir -p "$T/bin"
 for f in "$LLVM_ROOT"/bin/*; do
     case "$f" in *.cfg) ;; *) ln -s "$f" "$T/bin/" ;; esac
@@ -28,35 +31,37 @@ for d in include lib share libexec; do [ -e "$LLVM_ROOT/$d" ] && ln -s "$LLVM_RO
 # A linker stated by role, as a wrapper the test can change in place.
 printf '#!/bin/sh\nexec "%s/bin/ld.lld" "$@"\n' "$LLVM_ROOT" > "$work/ld-wrapper"
 chmod +x "$work/ld-wrapper"
+wrapper_HOST="$(host_path "$work/ld-wrapper")"
 
 mkdir -p "$work/app/src"
 cat > "$work/app/src/main.cpp" <<'CPP'
 #include <cstdio>
 int main() { std::puts("built by a toolchain named by path"); return 0; }
 CPP
 write_manifest() {
+    local root_HOST; root_HOST="$(host_path "$1")"
     cat > "$work/app/mcpp.toml" <<TOML
 [package]
 name    = "app"
 version = "0.1.0"
 
 [toolchain]
-default = { path = "$1"$2 }
+default = { path = "$root_HOST"$2 }
 TOML
 }
 cd "$work/app"
 fail() { echo "FAIL: $*"; echo "----"; echo "$out"; exit 1; }
 
-write_manifest "$T" ', launcher = "/usr/bin/env", tools = { ld = "'"$work/ld-wrapper"'" }'
+write_manifest "$T" ', launcher = "/usr/bin/env", tools = { ld = "'"$wrapper_HOST"'" }'
 rm -rf target
 out="$("$MCPP" build 2>&1)" || fail "the build failed"
-grep -q "Using toolchain clang .* ← $T  \[custom · mcpp.toml:[0-9]*\]" <<<"$out" || fail "no Using line for the toolchain"
+grep -q "Using toolchain clang .* ← $T_HOST  \[custom · mcpp.toml:[0-9]*\]" <<<"$out" || fail "no Using line for the toolchain"
 grep -q "Finished .* · custom: toolchain" <<<"$out" || fail "Finished does not summarise the source"
 run="$(./target/*/*/bin/app)"
 [[ "$run" == "built by a toolchain named by path" ]] || fail "the program did not run: $run"
 ninja="$(cat target/*/*/build.ninja)"
-grep -q "^cxx *= /usr/bin/env $T/bin/clang++" <<<"$ninja" || fail "the launcher does not prefix the compiler"
-grep -q -- "--ld-path=$work/ld-wrapper" <<<"$ninja" || fail "the stated linker is not used"
+grep -q "^cxx *= /usr/bin/env $T_HOST/bin/clang++" <<<"$ninja" || fail "the launcher does not prefix the compiler"
+grep -q -- "--ld-path=$wrapper_HOST" <<<"$ninja" || fail "the stated linker is not used"
 [[ -z "$(find "$T/" -maxdepth 2 -name '*.cfg' -print -quit)" ]] || fail "mcpp wrote a cfg into the tree"
 
 # The fast path serves an unchanged tree, and declines once a program of it changed.
@@ -77,7 +82,8 @@ out="$(MCPP_TOOLCHAIN="path:$T" "$MCPP" build 2>&1)" || fail "MCPP_TOOLCHAIN=pat
 grep -q "\[custom · env MCPP_TOOLCHAIN\]" <<<"$out" || fail "the env-named toolchain is not reported"
 
 # A stated family the drivers contradict is refused.
-write_manifest "$T" ', family = "gcc", tools = { cxx = "'"$T/bin/clang++"'" }'
+driver_HOST="$(host_path "$T/bin/clang++")"
+write_manifest "$T" ', family = "gcc", tools = { cxx = "'"$driver_HOST"'" }'
 rm -rf target
 out="$("$MCPP" build 2>&1 || true)"
 grep -q 'stated as family "gcc"' <<<"$out" || fail "a contradicting family was accepted"
@@ -96,7 +102,7 @@ gcc_base="$HOME/.mcpp/registry/data/xpkgs/xim-x-gcc"
 [[ -d "$gcc_base" && -n "${USERPROFILE:-}" ]] || true
 gcc_ver="$(ls -1 "$gcc_base" 2>/dev/null | grep -E '^[0-9]+(\.[0-9]+)*$' | sort -V | tail -1)"
 if [[ -n "$gcc_ver" && -x "$gcc_base/$gcc_ver/bin/g++" ]]; then
-    write_manifest "$gcc_base/$gcc_ver" ', tools = { ld = "'"$work/ld-wrapper"'" }'
+    write_manifest "$gcc_base/$gcc_ver" ', tools = { ld = "'"$wrapper_HOST"'" }'
     rm -rf target
     out="$("$MCPP" build 2>&1 || true)"
     grep -q "this is a gcc toolchain" <<<"$out" \