diff options
| author | Arthur Eubanks <aeubanks@google.com> | 2022-08-29 11:25:29 -0700 |
|---|---|---|
| committer | Arthur Eubanks <aeubanks@google.com> | 2022-08-29 11:25:29 -0700 |
| commit | e1489d5e51886617a1076bc33f17737f825500e3 (patch) | |
| tree | 9b9bff8475612004b1760edf499714d7b6bb79ad /runtimes | |
| parent | 7df0f0b410674437f0b56262043e22b177709161 (diff) | |
| download | llvm-e1489d5e51886617a1076bc33f17737f825500e3.tar.gz | |
Revert "[runtimes] Use a response file for runtimes test suites"
This reverts commit 992e10a3fce41255e4b11782f51d0f4b26dca14d.
Breaks builds with LLVM_INCLUDE_TESTS=OFF, see comments in D132438.
Diffstat (limited to 'runtimes')
| -rw-r--r-- | runtimes/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | runtimes/Tests.cmake.in | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index 8da7d4577727..6f59ec661ed2 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -244,12 +244,14 @@ if(LLVM_INCLUDE_TESTS) ${CMAKE_CURRENT_BINARY_DIR}/llvm-lit) endif() - get_property(LLVM_RUNTIMES_LIT_TESTSUITES GLOBAL PROPERTY LLVM_RUNTIMES_LIT_TESTSUITES) - string(REPLACE ";" "\n" LLVM_RUNTIMES_LIT_TESTSUITES "${LLVM_RUNTIMES_LIT_TESTSUITES}") if(LLVM_RUNTIMES_TARGET) - file(WRITE ${LLVM_BINARY_DIR}/runtimes/${LLVM_RUNTIMES_TARGET}/Tests.rsp ${LLVM_RUNTIMES_LIT_TESTSUITES}) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/Tests.cmake.in + ${LLVM_BINARY_DIR}/runtimes/${LLVM_RUNTIMES_TARGET}/Tests.cmake) else() - file(WRITE ${LLVM_BINARY_DIR}/runtimes/Tests.rsp ${LLVM_RUNTIMES_LIT_TESTSUITES}) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/Tests.cmake.in + ${LLVM_BINARY_DIR}/runtimes/Tests.cmake) endif() endif() diff --git a/runtimes/Tests.cmake.in b/runtimes/Tests.cmake.in new file mode 100644 index 000000000000..8108349bec41 --- /dev/null +++ b/runtimes/Tests.cmake.in @@ -0,0 +1,3 @@ +set(SUB_LIT_TESTSUITES @LLVM_RUNTIMES_LIT_TESTSUITES@) +set(SUB_LIT_PARAMS @LLVM_RUNTIMES_LIT_PARAMS@) +set(SUB_LIT_EXTRA_ARGS @LLVM_RUNTIMES_LIT_EXTRA_ARGS@) |