Skip to content

Commit 923f7aa

Browse files
committed
Revert "Keep ci-script labels after CTest label clearing"
This reverts commit 5140571.
1 parent 5140571 commit 923f7aa

1 file changed

Lines changed: 15 additions & 17 deletions

File tree

‎tests/CMakeLists.txt‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2273,6 +2273,21 @@ 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)
22762291
# F10's source-only benchmark witnesses require the pinned Git history.
22772292
add_test(NAME test_benchmark_harness
22782293
COMMAND ${Python3_EXECUTABLE} -m unittest discover -s benchmarks/tests)
@@ -8276,23 +8291,6 @@ foreach(_pf_fast_test IN LISTS PINEFORGE_PR_FAST_TESTS)
82768291
set_property(TEST ${_pf_fast_test} APPEND PROPERTY LABELS fast)
82778292
endif()
82788293
endforeach()
8279-
8280-
# These CI-script self-tests are independent of CPU architecture. The arm
8281-
# workflow excludes only this explicit population; amd64 Release runs it all.
8282-
# R4-D L6a's clear resets LABELS on the verifier slices, so keep this APPEND
8283-
# after every label clear and after the slow/fast loops; the slices retain slow.
8284-
set_property(TEST ${PINEFORGE_CI_VERIFY_SLICES}
8285-
test_ci_verify_slices_cover test_ci_verify_fetch_lock
8286-
test_ci_preflight_slice_1
8287-
test_ci_preflight_slice_2
8288-
test_ci_preflight_slice_3
8289-
test_ci_preflight_slice_4
8290-
test_ci_preflight_slice_5
8291-
test_ci_preflight_slice_6
8292-
test_ci_preflight_slice_7
8293-
test_ci_preflight_slice_8
8294-
test_ci_preflight_slices_cover
8295-
APPEND PROPERTY LABELS ci-script)
82968294
get_directory_property(_pf_registered_tests TESTS)
82978295
foreach(_pf_registered_test IN LISTS _pf_registered_tests)
82988296
get_test_property(${_pf_registered_test} LABELS _pf_registered_test_labels)

0 commit comments

Comments
 (0)