diff options
| author | Yang Liu <numbksco@gmail.com> | 2024-09-05 17:07:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 11:07:27 +0200 |
| commit | 4e63b82f5eda8995a2b5cd09d64304ac9e30dbd6 (patch) | |
| tree | 0141a4651e55dd11df71e41b40e45df4106535c2 /CMakeLists.txt | |
| parent | 6bc2abae3b71ad1aea750fbfb433310f6e45bbac (diff) | |
| download | box64-4e63b82f5eda8995a2b5cd09d64304ac9e30dbd6.tar.gz box64-4e63b82f5eda8995a2b5cd09d64304ac9e30dbd6.zip | |
[CI] Refactored CI (#1795)
* [CI] Enable Box32 tests on LA64 * upgrade QEMU * [COSIM] Removed thread-safe tests * Use regular cosim in CI * [CI] Simplified "Test Box64" * exclude certain tests when testing with cosim * review * box64.pod too
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 96d75235..37e5407c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1249,12 +1249,12 @@ add_test(fork ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX64} -D TEST_REFERENCE=${CMAKE_SOURCE_DIR}/tests/ref09.txt -P ${CMAKE_SOURCE_DIR}/runTest.cmake ) -add_test(cppThreads ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX64} +add_test(cppThreads_nocosim ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX64} -D TEST_ARGS=${CMAKE_SOURCE_DIR}/tests/test10 -D TEST_OUTPUT=tmpfile10.txt -D TEST_REFERENCE=${CMAKE_SOURCE_DIR}/tests/ref10.txt -P ${CMAKE_SOURCE_DIR}/runTest.cmake ) -set_tests_properties(cppThreads PROPERTIES ENVIRONMENT "BOX64_LD_LIBRARY_PATH=${CMAKE_SOURCE_DIR}/x64lib") +set_tests_properties(cppThreads_nocosim PROPERTIES ENVIRONMENT "BOX64_LD_LIBRARY_PATH=${CMAKE_SOURCE_DIR}/x64lib") add_test(tlsData ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX64} -D TEST_ARGS=${CMAKE_SOURCE_DIR}/tests/test11 -D TEST_OUTPUT=tmpfile11.txt @@ -1604,7 +1604,7 @@ if(BOX32) -P ${CMAKE_SOURCE_DIR}/runTest.cmake ) if(NOT LD80BITS) - add_test(NAME conditionalThreads_32bits COMMAND ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX64} + add_test(NAME conditionalThreads_32bits_nocosim COMMAND ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX64} -D TEST_ARGS=${CMAKE_SOURCE_DIR}/tests32/test14 -D TEST_OUTPUT=tmpfile32_14.txt -D TEST_REFERENCE=${CMAKE_SOURCE_DIR}/tests32/ref14.txt -P ${CMAKE_SOURCE_DIR}/runTest.cmake ) |