Skip to content

Commit b2102cf

Browse files
CI: six Linux e2e shards with the new tests' measured durations; e2e 981 runs over the emsdk the scan job installs, e2e 988 in the wine job; e2e 730 reports the shared home's state when the rung is not taken
Co-authored-by: speak-agent <248744407+speak-agent@users.noreply.github.com>
1 parent 7583184 commit b2102cf

5 files changed

Lines changed: 55 additions & 7 deletions

File tree

‎.github/workflows/ci-linux-e2e.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
name: ci-linux-e2e
22

33
# The e2e suite (tests/e2e/run_all.sh) on Linux, called by ci.yml beside
4-
# ci-linux.yml after the Linux build. Four shards, assigned by measured
5-
# duration (tests/e2e/timings/linux.tsv, rule R4 of the 2026-10-02 CI record),
4+
# ci-linux.yml after the Linux build. Six shards, assigned by measured
5+
# duration (tests/e2e/timings/linux.tsv, rule R4 of the 2026-10-02 CI record):
6+
# the table holds about 72 minutes of tests (2026-10-30, with the target-set
7+
# and packaging tests of 2026.10.30.1), about 12 a shard,
68
# each running the one binary build.yml produced (use-built-mcpp, rule R1).
79
# Each shard writes a per-test report that the e2e-coverage job of ci.yml reads
810
# (rule R5).
@@ -15,15 +17,15 @@ on:
1517

1618
jobs:
1719
e2e:
18-
name: e2e ${{ matrix.shard }}/4 (linux x86_64, self-host)
20+
name: e2e ${{ matrix.shard }}/6 (linux x86_64, self-host)
1921
runs-on: ubuntu-24.04
2022
timeout-minutes: 45
2123
strategy:
2224
fail-fast: false
2325
matrix:
24-
shard: [1, 2, 3, 4]
26+
shard: [1, 2, 3, 4, 5, 6]
2527
env:
26-
E2E_SHARD: ${{ matrix.shard }}/4
28+
E2E_SHARD: ${{ matrix.shard }}/6
2729
E2E_TIMINGS: tests/e2e/timings/linux.tsv
2830
E2E_REPORT: ${{ github.workspace }}/e2e-report-linux-${{ matrix.shard }}.tsv
2931
MCPP_HOME: /home/runner/.mcpp

‎.github/workflows/ci-target-matrix.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,14 @@ jobs:
420420
exit 1
421421
fi
422422
echo "ok: wasm32-emscripten ran through the payload's runner; the decoy node was never run"
423+
# #851 (e2e 981) needs the emsdk payload this step has just installed;
424+
# the shards have none and skip it, so it runs here, in that home.
425+
MCPP="$MCPP_UNDER_TEST" bash tests/e2e/981_a_web_link_has_the_profiles_level_and_the_wasm_exception_model.sh 2>&1 \
426+
| tee "$RUNNER_TEMP/981.log"
427+
if grep -q '^SKIP' "$RUNNER_TEMP/981.log" || ! grep -qx 'PASS: 981' "$RUNNER_TEMP/981.log"; then
428+
echo "::error::e2e 981 did not run to its PASS line over the installed emsdk"
429+
exit 1
430+
fi
423431
424432
coverage:
425433
# THE DENOMINATOR. Every check above is per host, and no per-host check

‎.github/workflows/cross-build-test.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,18 @@ jobs:
431431
grep -qxF "$line" "$log" || { echo "::error::797 did not print: $line"; exit 1; }
432432
done
433433
434+
# The Windows launcher of an ok-image tree (`bin/<name>.exe`, built over
435+
# the platform's hosted arrangement) finds its package from a Windows
436+
# path. The shards have no wine; this job does.
437+
- name: "e2e: the Windows launcher finds its package from a Windows path (988)"
438+
run: |
439+
set -o pipefail
440+
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
441+
log="$RUNNER_TEMP/988.log"
442+
bash tests/e2e/988_the_windows_launcher_finds_its_package_from_a_windows_path.sh 2>&1 | tee "$log"
443+
grep -qxF "PASS: 988 the Windows launcher finds its package from a Windows path" "$log" \
444+
|| { echo "::error::988 did not print its PASS line"; exit 1; }
445+
434446
# 257 needs a Linux-hosted MinGW compiler AND wine, which only this job
435447
# has; on the shards it skipped, and it had run on no runner (finding F9
436448
# of the 2026-10-02 CI record).

‎tests/e2e/730_bare_compat_dependency_is_not_a_refresh_miss.sh‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,23 @@ echo 'int main() { return 0; }' > "$TMP/app/src/main.cpp"
4444
cd "$TMP/app"
4545
MCPP_OFFLINE=1 "$MCPP" emit build-database --format json -v > out.json 2> err.txt || true
4646

47-
grep -q "resolved to 'compat.$DESC' through the deprecated bare-name search" err.txt \
48-
|| fail "A: the resolver did not take the bare-name rung for $DESC" err.txt
47+
# What the shared home held when the rung was not taken: the test passes on a
48+
# fresh home and failed only after other tests of its shard, so the state of
49+
# the home is the evidence.
50+
home_state() {
51+
local h="${MCPP_HOME:-$HOME/.mcpp}"
52+
echo "--- home: $h ---"
53+
ls -la "$h/indices" 2>&1
54+
for d in "$h"/indices/*/; do
55+
echo "index $d: $(git -C "$d" log -1 --format='%h %cI' 2>/dev/null || echo 'no git')"
56+
ls "$d/pkgs/c" 2>/dev/null | grep -i "$DESC" | sed 's/^/ /'
57+
done
58+
echo "--- $h/config.toml ---"; cat "$h/config.toml" 2>&1
59+
}
60+
if ! grep -q "resolved to 'compat.$DESC' through the deprecated bare-name search" err.txt; then
61+
home_state
62+
fail "A: the resolver did not take the bare-name rung for $DESC" err.txt
63+
fi
4964
if grep -a "index: $DESC@$VER: offline mode" err.txt; then
5065
fail "B: the refresh decision asked for a network refresh of a dependency the resolver found" err.txt
5166
fi

‎tests/e2e/timings/linux.tsv‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,5 +589,16 @@
589589
960_an_image_of_another_architecture_runs_through_its_execution_host.sh 150000
590590
961_a_one_target_package_carries_the_image_in_a_program_of_its_architecture.sh 120000
591591
962_a_webassembly_package_is_neither_an_xlings_entry_nor_a_single_file.sh 1000
592+
963_a_target_set_builds_every_member_and_runs_where_it_is_reached.sh 58687
593+
964_tests_built_once_run_from_an_archive.sh 89194
592594
96_msvc_unavailable_nonwindows.sh 38
595+
980_an_ambiguous_dependency_name_is_no_packages.sh 2257
596+
981_a_web_link_has_the_profiles_level_and_the_wasm_exception_model.sh 5
597+
982_an_action_reads_the_builds_contract.sh 815
598+
983_a_pack_holds_the_legs_it_names.sh 155041
599+
984_a_set_of_programs_is_a_package_per_leg.sh 16305
600+
985_a_format_list_writes_each_container_of_one_tree.sh 240000
601+
986_single_files_cover_the_legs_and_systems.sh 240000
602+
987_the_universal_spellings_are_migrated.sh 107535
603+
988_the_windows_launcher_finds_its_package_from_a_windows_path.sh 5
593604
98_reflection_import_std.sh 7170

0 commit comments

Comments
 (0)