Skip to content

Commit

Permalink
unittests: Be more strict with -- separator
Browse files Browse the repository at this point in the history
  • Loading branch information
Sonicadvance1 committed Sep 24, 2024
1 parent 9b144f4 commit 9d0596d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
8 changes: 4 additions & 4 deletions unittests/32Bit_ASM/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ 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()

if (ENABLE_VIXL_SIMULATOR)
set(CPU_CLASS Simulator)
elseif (_M_X86_64)
list(APPEND TEST_ARGS
"--no-silentlog -g" "host" "host"
"--no-silentlog -g --" "host" "host"
)
endif()

Expand Down
2 changes: 2 additions & 0 deletions unittests/ASM/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion unittests/ThunkFunctionalTests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

0 comments on commit 9d0596d

Please sign in to comment.