Skip to content

Commit

Permalink
unittests: Fixes incorrect argument
Browse files Browse the repository at this point in the history
Turns out our unittests have been passing an incorrect argument for
years.
  • Loading branch information
Sonicadvance1 committed Sep 15, 2024
1 parent e190d02 commit 88e3164
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 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-silent -g -n 1 --no-multiblock" "jit_1" "jit"
"--no-silent -g -n 500 --no-multiblock" "jit_500" "jit"
"--no-silent -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-silent -g" "host" "host"
"--no-silentlog -g" "host" "host"
)
endif()

Expand Down
8 changes: 4 additions & 4 deletions unittests/ASM/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ foreach(ASM_SRC ${ASM_SOURCES})
set(TEST_ARGS)
if (_M_ARM_64 OR ENABLE_VIXL_SIMULATOR)
list(APPEND TEST_ARGS
"--no-silent -g -n 1 --no-multiblock" "jit_1" "jit"
"--no-silent -g -n 500 --no-multiblock" "jit_500" "jit"
"--no-silent -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-silent -g" "host" "host"
"--no-silentlog -g" "host" "host"
)
endif()

Expand Down
2 changes: 1 addition & 1 deletion unittests/FEXLinuxTests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function(AddTests Tests BinDirectory Bitness)
"guest"
"$<TARGET_FILE:FEXLoader>"
${THUNK_ARGS}
"-o" "stderr" "--no-silent" "-n" "500" "--"
"-o" "stderr" "--no-silentlog" "-n" "500" "--"
"${BIN_PATH}")

if (_M_X86_64 AND NOT TEST_NAME STREQUAL "thunk_testlib")
Expand Down
2 changes: 1 addition & 1 deletion unittests/POSIX/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ foreach(POSIX_TEST ${POSIX_TESTS})
"${TEST_NAME}"
"guest"
"${CMAKE_BINARY_DIR}/Bin/FEXLoader"
"-o" "stderr" "--no-silent" "-n" "500" "--"
"-o" "stderr" "--no-silentlog" "-n" "500" "--"
"${POSIX_TEST}")
set_property(TEST "${TEST_NAME}.jit.posix" APPEND PROPERTY SKIP_RETURN_CODE 125)
endforeach()
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-silent" "-n" "500"
"-o" "stderr" "--no-silentlog" "-n" "500"
)
if (NOT ThunksFile)
set (TEST_NAME ThunkFunctionalTest-NoThunks-${Bin})
Expand Down
2 changes: 1 addition & 1 deletion unittests/gcc-target-tests-32/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ foreach(TEST ${TESTS})
"${TEST_NAME}"
"guest"
"${CMAKE_BINARY_DIR}/Bin/FEXLoader"
"-o" "stderr" "--no-silent" "-n" "500" "--"
"-o" "stderr" "--no-silentlog" "-n" "500" "--"
"${TEST}")
set_property(TEST "${TEST_NAME}.jit.gcc-target-32" APPEND PROPERTY SKIP_RETURN_CODE 125)
endforeach()
Expand Down
2 changes: 1 addition & 1 deletion unittests/gcc-target-tests-64/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ foreach(TEST ${TESTS})
"${TEST_NAME}"
"guest"
"${CMAKE_BINARY_DIR}/Bin/FEXLoader"
"-o" "stderr" "--no-silent" "-n" "500" "--"
"-o" "stderr" "--no-silentlog" "-n" "500" "--"
"${TEST}")
set_property(TEST "${TEST_NAME}.jit.gcc-target-64" APPEND PROPERTY SKIP_RETURN_CODE 125)
endforeach()
Expand Down
2 changes: 1 addition & 1 deletion unittests/gvisor-tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ foreach(TEST ${TESTS})
"${TEST_NAME}"
"guest"
"${CMAKE_BINARY_DIR}/Bin/FEXLoader"
"-o" "stderr" "--no-silent" "-n" "500" "--"
"-o" "stderr" "--no-silentlog" "-n" "500" "--"
"${TEST}")
set_property(TEST "${TEST_NAME}.jit.gvisor" APPEND PROPERTY SKIP_RETURN_CODE 125)
endforeach()
Expand Down

0 comments on commit 88e3164

Please sign in to comment.