unittests: Be more strict with -- separator

FEX-Emu · Sep 18, 2024 · b6c9a5b · b6c9a5b
1 parent c4da55f
commit b6c9a5b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/unittests/32Bit_ASM/CMakeLists.txt b/unittests/32Bit_ASM/CMakeLists.txt
@@ -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()
 

diff --git 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
@@ -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})