From 9d0596de8914c8379a3bcfee8ac23b32489e21ef Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 14 Sep 2024 23:27:09 -0700 Subject: [PATCH] unittests: Be more strict with -- separator --- unittests/32Bit_ASM/CMakeLists.txt | 8 ++++---- unittests/ASM/CMakeLists.txt | 2 ++ unittests/ThunkFunctionalTests/CMakeLists.txt | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/unittests/32Bit_ASM/CMakeLists.txt b/unittests/32Bit_ASM/CMakeLists.txt index 203387a02a..c23d1fe41c 100644 --- a/unittests/32Bit_ASM/CMakeLists.txt +++ b/unittests/32Bit_ASM/CMakeLists.txt @@ -51,9 +51,9 @@ foreach(ASM_SRC ${ASM_SOURCES}) set(TEST_ARGS) if (_M_ARM_64 OR ENABLE_VIXL_SIMULATOR) list(APPEND TEST_ARGS - "--no-silentlog -g -n 1 --no-multiblock" "jit_1" "jit" - "--no-silentlog -g -n 500 --no-multiblock" "jit_500" "jit" - "--no-silentlog -g -n 500 --multiblock" "jit_500_m" "jit" + "--no-silentlog -g -n 1 --no-multiblock --" "jit_1" "jit" + "--no-silentlog -g -n 500 --no-multiblock --" "jit_500" "jit" + "--no-silentlog -g -n 500 --multiblock --" "jit_500_m" "jit" ) endif() @@ -61,7 +61,7 @@ foreach(ASM_SRC ${ASM_SOURCES}) set(CPU_CLASS Simulator) elseif (_M_X86_64) list(APPEND TEST_ARGS - "--no-silentlog -g" "host" "host" + "--no-silentlog -g --" "host" "host" ) endif() diff --git a/unittests/ASM/CMakeLists.txt b/unittests/ASM/CMakeLists.txt index b71c47e6da..2af79f003c 100644 --- a/unittests/ASM/CMakeLists.txt +++ b/unittests/ASM/CMakeLists.txt @@ -90,6 +90,8 @@ foreach(ASM_SRC ${ASM_SOURCES}) list(APPEND ARGS_LIST "--smcchecks=full") endif() + list(APPEND ARGS_LIST "--") + add_test(NAME ${TEST_NAME} COMMAND "python3" "${CMAKE_SOURCE_DIR}/Scripts/testharness_runner.py" "${CMAKE_SOURCE_DIR}/unittests/ASM/Known_Failures" diff --git a/unittests/ThunkFunctionalTests/CMakeLists.txt b/unittests/ThunkFunctionalTests/CMakeLists.txt index aa7fb6860d..2888969d52 100644 --- a/unittests/ThunkFunctionalTests/CMakeLists.txt +++ b/unittests/ThunkFunctionalTests/CMakeLists.txt @@ -4,7 +4,7 @@ function(AddThunksTest Bin ThunksFile) set (ARGS "-t" "${CMAKE_INSTALL_PREFIX}/lib/fex-emu/HostThunks" "-j" "${CMAKE_INSTALL_PREFIX}/share/fex-emu/GuestThunks" - "-o" "stderr" "--no-silentlog" "-n" "500" + "-o" "stderr" "--no-silentlog" "-n" "500" "--" ) if (NOT ThunksFile) set (TEST_NAME ThunkFunctionalTest-NoThunks-${Bin})