Skip to content

Commit 4737131

Browse files
committed
Merge commit '9e42fe999948cc06ece23acde0d5bde803888cbc' into ci/x86-release-required
2 parents 5efac4a + 9e42fe9 commit 4737131

2 files changed

Lines changed: 20 additions & 16 deletions

File tree

‎tests/CMakeLists.txt‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2273,21 +2273,6 @@ add_test(NAME test_ci_preflight_slice_8
22732273
COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/test_ci_preflight.py --slice 8/8)
22742274
add_test(NAME test_ci_preflight_slices_cover
22752275
COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/test_ci_preflight_split.py)
2276-
# These CI-script self-tests are independent of CPU architecture. The arm
2277-
# workflow excludes only this explicit population; amd64 Release runs it all.
2278-
# Append so the verifier slices retain their existing slow label as well.
2279-
set_property(TEST ${PINEFORGE_CI_VERIFY_SLICES}
2280-
test_ci_verify_slices_cover test_ci_verify_fetch_lock
2281-
test_ci_preflight_slice_1
2282-
test_ci_preflight_slice_2
2283-
test_ci_preflight_slice_3
2284-
test_ci_preflight_slice_4
2285-
test_ci_preflight_slice_5
2286-
test_ci_preflight_slice_6
2287-
test_ci_preflight_slice_7
2288-
test_ci_preflight_slice_8
2289-
test_ci_preflight_slices_cover
2290-
APPEND PROPERTY LABELS ci-script)
22912276
# F10's source-only benchmark witnesses require the pinned Git history.
22922277
add_test(NAME test_benchmark_harness
22932278
COMMAND ${Python3_EXECUTABLE} -m unittest discover -s benchmarks/tests)
@@ -7679,6 +7664,25 @@ if(PINEFORGE_COHORT_EXPOSURE_FIXTURES)
76797664
endforeach()
76807665
endif()
76817666

7667+
# These CI-script self-tests are independent of CPU architecture. The arm
7668+
# workflow excludes only this explicit population; amd64 Release runs it all.
7669+
# R4-D L6a's clear resets LABELS on the verifier slices, so keep this APPEND
7670+
# after every label clear and the slow loop (the slices retain slow), and
7671+
# before the CR-150 include block: check_cr150_cmake_d allows only fences
7672+
# after it, and ci_preflight pins the fast-row registration as the tail.
7673+
set_property(TEST ${PINEFORGE_CI_VERIFY_SLICES}
7674+
test_ci_verify_slices_cover test_ci_verify_fetch_lock
7675+
test_ci_preflight_slice_1
7676+
test_ci_preflight_slice_2
7677+
test_ci_preflight_slice_3
7678+
test_ci_preflight_slice_4
7679+
test_ci_preflight_slice_5
7680+
test_ci_preflight_slice_6
7681+
test_ci_preflight_slice_7
7682+
test_ci_preflight_slice_8
7683+
test_ci_preflight_slices_cover
7684+
APPEND PROPERTY LABELS ci-script)
7685+
76827686
# CR-150: one file per lane in tests/cr150.d/<lane>.cmake (see tests/cr150.d/README.md).
76837687
file(GLOB CR150_LANE_CMAKE CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/cr150.d/*.cmake")
76847688
list(SORT CR150_LANE_CMAKE)

‎tests/private_fixture_reads.evidence‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
// longer sits there, and scripts/test_private_fixture_reads.py runs that sweep
66
// (with RED controls on a tampered copy of the tree), so the proof cannot rot
77
// silently.
8-
test_pooc_close_fill_view_tapes tests/CMakeLists.txt:3449 if(_pf_pcv_emitted GREATER 0 AND _pf_pcv_emitted EQUAL _pf_pcv_listed) the module (and with it the add_test at :3469) is built only when every tape the list names has its generated.cpp: _pf_pcv_emitted counts only tapes whose file exists (EXISTS at tests/CMakeLists.txt:3433, emitted increment at :3445). On the fixture-less tree the else branch's registration and skip property (:3475-3476) register the row as the pinned SKIP placeholder naming tests/fixtures/pooc_close_fill_view/tapes.txt, so the row registers and reports itself skipped instead of vanishing.
8+
test_pooc_close_fill_view_tapes tests/CMakeLists.txt:3434 if(_pf_pcv_emitted GREATER 0 AND _pf_pcv_emitted EQUAL _pf_pcv_listed) the module (and with it the add_test at :3454) is built only when every tape the list names has its generated.cpp: _pf_pcv_emitted counts only tapes whose file exists (EXISTS at tests/CMakeLists.txt:3418, emitted increment at :3430). On the fixture-less tree the else branch's registration and skip property (:3460-3476) register the row as the pinned SKIP placeholder naming tests/fixtures/pooc_close_fill_view/tapes.txt, so the row registers and reports itself skipped instead of vanishing.

0 commit comments

Comments
 (0)