Skip to content

Commit e61a9ff

Browse files
authored
Merge pull request #924 from steffenlarsen/steffen/remove_test_all
Remove test_all target
2 parents 730188d + 55e3700 commit e61a9ff

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ Finally, start the compilation:
4545
`cmake --build ./build`
4646

4747
After the compilation has finished, test executables for each category will be
48-
placed in the `build/bin` directory. The `test_all` executable contains tests
49-
for all categories.
48+
placed in the `build/bin` directory.
5049

5150
### CMake Configuration Options
5251

@@ -98,7 +97,7 @@ Additionally, the following SYCL implementation-specific options can be used:
9897

9998
Each of the executables produced in the `build/bin` directory acts as a
10099
standalone test runner that can be used to launch tests for a particular test
101-
category (or all tests in the case of `build/bin/test_all`).
100+
category.
102101

103102
The ``--device`` argument is used to specify which device to run the tests on.
104103
Selection is based on substring matching of the device name. ECMAScript regular

ci/generate_exclude_filter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def query_cmake_targets(build_dir: str):
8888
cmake_targets = []
8989
for rt in raw_targets:
9090
m = target_pattern.match(rt)
91-
if m and m.group(1) != 'test_all':
91+
if m:
9292
cmake_targets.append(m.group(1))
9393

9494
return cmake_targets

docs/README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ This adds a test case with the description `"a simple test case"` and the _tag_
230230
Both can later be used to narrow down the set of test cases that will be executed during runtime.
231231

232232
When configuring CMake, the new test category will automatically be detected and a target with the name `test_simple` is added.
233-
You can run the test case by either executing `./bin/test_simple` directly, or alternatively as part of `./bin/test_all`.
233+
You can run the test case by executing `./bin/test_simple`.
234234

235235
IMPORTANT: For historic reasons, the CTS currently contains many test cases that are written in a different style.
236236
Please see <<New-style vs Legacy Test Cases>> for more information.

tests/CMakeLists.txt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,7 @@ function(generate_cts_test)
158158
add_dependencies(generate_test_sources ${GEN_TEST_FILE_NAME}_gen)
159159
endfunction()
160160

161-
# create a target to group all tests together into one test executable
162-
add_executable(test_all)
163-
164-
# create a target to encapsulate all test categories, excluding test_all. This
165-
# is intended for conformance testing to avoid redundant testing and excessive
166-
# resource use from building and running test_all.
161+
# create a target to encapsulate all test categories.
167162
add_custom_target(test_conformance)
168163

169164
# create test executable targets for each test project using the build_sycl function
@@ -208,8 +203,6 @@ function(add_cts_test_helper)
208203
set_property(TARGET ${test_exe_name}_objects
209204
PROPERTY FOLDER "Tests/${test_exe_name}")
210205

211-
target_sources(test_all PRIVATE $<TARGET_OBJECTS:${test_exe_name}_objects>)
212-
213206
add_dependencies(test_conformance ${test_exe_name})
214207
endfunction()
215208

@@ -254,7 +247,3 @@ foreach(dir ${test_category_dirs})
254247
add_subdirectory(${dir})
255248
endif()
256249
endforeach()
257-
258-
target_link_libraries(test_all PRIVATE CTS::util CTS::main_function oclmath)
259-
target_link_libraries(test_all PRIVATE Catch2::Catch2 Threads::Threads)
260-
add_sycl_to_target(TARGET test_all)

0 commit comments

Comments
 (0)