e2e 779, 787, 826: the status line names the package; a workspace document of one configuration names its sets without a prefix (SPEC-005 v1.6)

Author: speak-agent

tests/e2e/779_a_build_program_declares_a_runtime_search_dir.sh

@@ -119,7 +119,7 @@ grep -F -- "-Wl,-rpath,$RTDIR" "$G" >/dev/null \
 touch src/main.cpp   # past the whole-project no-op fast path, without
                       # touching build.mcpp itself
 "$MCPP" build > b2.log 2>&1 || fail "second build failed" b2.log
-grep -q "up to date (cached)" b2.log \
+grep -qE "up to date .*\(cached\)" b2.log \
   || fail "the second build re-ran build.mcpp; the replay path was not exercised" b2.log
 G2=$(find_graph)
 [ -n "$G2" ] || fail "no build.ninja after the second build" b2.log

tests/e2e/787_emit_plans_every_member_on_its_own.sh

@@ -16,7 +16,8 @@
 # narrower case (E3, #699 item 2 -- see e2e 789), where the member is still
 # described. Criteria:
 #   A. `emit --workspace --format json` over `good` and `bad`: exit 1, `data`
-#      present, its one set is `good/good`, `diagnostics` holds exactly one
+#      present, its one set is `good` (one configuration: no prefix, SPEC-005
+#      v1.6 R3.3), `diagnostics` holds exactly one
 #      `error` with `path` "bad/mcpp.toml" and a message naming `bad`, and
 #      `watch` lists `bad/mcpp.toml` alongside `good`'s own inputs.
 #   B. Without `--format`, the same run prints the document (not empty) and
@@ -66,7 +67,7 @@ import json, sys
 e = json.load(open(sys.argv[1]))
 d = e["data"]
 sets = [s["name"] for s in d["database"]["sets"]]
-assert sets == ["good/good"], sets
+assert sets == ["good"], sets
 diags = e["diagnostics"]
 assert len(diags) == 1, diags
 diag = diags[0]
@@ -86,7 +87,7 @@ rc=$?
 set -e
 [ "$rc" = 1 ] || fail "B: bare invocation exit status $rc, expected 1" b.out b.err
 [ -s b.out ] || fail "B: the bare document is empty" b.err
-"$PY" -c 'import json,sys; d=json.load(open(sys.argv[1])); assert d["sets"][0]["name"]=="good/good", d["sets"]' b.out \
+"$PY" -c 'import json,sys; d=json.load(open(sys.argv[1])); assert d["sets"][0]["name"]=="good", d["sets"]' b.out \
     || fail "B: the bare document's set" b.out
 grep -q "bad" b.err || fail "B: the failed member's reason is not on stderr" b.err
 echo "ok: B, the exit code is 1 without --format too, and the document still prints"

tests/e2e/826_plugin_diagnostics_features_and_names.sh

@@ -70,7 +70,7 @@ grep -q "mcpp.acme.gen'.*mcpp\.\|claims an origin" d1.log && fail "R1: an own-na
 # fast path and reaches no build program, so it would measure neither path.
 touch src/main.cpp
 "$MCPP" build > d2.log 2>&1 || fail "D2: the second build failed" d2.log
-grep -q "up to date (cached)" d2.log || fail "D2: the second build ran the program; the replay is not measured" d2.log
+grep -qE "up to date .*\(cached\)" d2.log || fail "D2: the second build ran the program; the replay is not measured" d2.log
 grep -q "impact: no bindings are generated" d2.log || fail "D2: the cached run did not report the diagnostic" d2.log
 
 # N1