diff --git a/sh/gh/nightly.sh b/sh/gh/nightly.sh index c96c3da3bd..44b2378c99 100755 --- a/sh/gh/nightly.sh +++ b/sh/gh/nightly.sh @@ -135,8 +135,6 @@ case "$1" in SESSION_CPU=1 criterion net-cpu -p moq-net --features fuzz --bench session -- session_delivery_group_cost_cpu # Measure each kio routine, including the contended bench's worker threads. criterion kio --no-fail-fast -p kio --bench '*' - # moq-gst's catalog bench shares a target name with moq-mux's, so it runs on its own. - criterion gst -p moq-gst --bench catalog ;; rust-shared) # One invocation unifies this release build instead of rebuilding shared crates @@ -155,6 +153,8 @@ case "$1" in rust-extra) criterion qmux --manifest-path rs/qmux/Cargo.toml --bench receive criterion msf -p moq-msf --bench catalog + # moq-gst's catalog bench shares a target name with moq-mux's, so it runs on its own. + criterion gst -p moq-gst --bench catalog # The allocation/window/play-buffer/batch/receive-bursts/openh264 tables keep their stdout in the run; # only Criterion estimates enter the trend report. criterion extra --no-fail-fast -p moq-e2ee -p moq-json -p moq-archive -p moq-cli -p moq-mux -p moq-audio \ diff --git a/sh/gh/nightly.test.py b/sh/gh/nightly.test.py index 4590e3d521..433ce01270 100644 --- a/sh/gh/nightly.test.py +++ b/sh/gh/nightly.test.py @@ -305,7 +305,7 @@ def test_bench_targets_share_one_invocation(self): result, calls = self.run_group("rust-bench") self.assertEqual(result.returncode, 0, result.stderr) release = [call for call in calls if call.startswith("just gh criterion")] - self.assertEqual(len(release), 4) # moq-net, its CPU clock, kio, then GStreamer. + self.assertEqual(len(release), 3) # moq-net, its CPU clock, then kio. # The CPU clock reuses moq-net's build instead of rebuilding it without fuzz. self.assertTrue( any( @@ -313,7 +313,7 @@ def test_bench_targets_share_one_invocation(self): for call in release ) ) - self.assertEqual(release[-1], "just gh criterion -p moq-gst --bench catalog") + self.assertEqual(release[-1], "just gh criterion --no-fail-fast -p kio --bench *") self.assertTrue(calls[-1].startswith("just gh benchmark-report rust ")) result, calls = self.run_group("rust-shared") self.assertEqual(result.returncode, 0, result.stderr) @@ -469,7 +469,7 @@ def test_failed_release_build_does_not_hide_later_work(self): result, calls = self.run_group("rust-bench", build) self.assertEqual(result.returncode, 1) # A failed group publishes no report, but every later target still runs. - self.assertEqual(calls[-1], "just gh criterion -p moq-gst --bench catalog") + self.assertEqual(calls[-1], "just gh criterion --no-fail-fast -p kio --bench *") def test_unknown_group_fails_before_running_anything(self): result, calls = self.run_group("unknown")