]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Fixed running fuzzers with cmake on arm.
authorNathan Moinvaziri <nathan@nathanm.com>
Fri, 20 Sep 2019 23:46:50 +0000 (16:46 -0700)
committerHans Kristian Rosbach <hk-github@circlestorm.org>
Sat, 21 Sep 2019 06:48:12 +0000 (08:48 +0200)
CMakeLists.txt

index 30b4ac7426e4e7cbf5188000ee0d4fb5beaba543..55102d44ac5ce8827f83703634a9c37fb1e2d7c7 100644 (file)
@@ -846,7 +846,8 @@ if (ZLIB_ENABLE_TESTS)
 
     add_executable(example test/example.c)
     configure_test_executable(example)
-    add_test(NAME example COMMAND example${CMAKE_EXECUTABLE_SUFFIX})
+    set(EXAMPLE_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:example>)
+    add_test(NAME example COMMAND ${EXAMPLE_COMMAND})
 
     add_executable(minigzip test/minigzip.c)
     configure_test_executable(minigzip)
@@ -867,7 +868,8 @@ if (ZLIB_ENABLE_TESTS)
         add_executable(example64 test/example.c)
         configure_test_executable(example64)
         set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-        add_test(NAME example64 COMMAND example64${CMAKE_EXECUTABLE_SUFFIX})
+        set(EXAMPLE64_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:example64>)
+        add_test(NAME example64 COMMAND ${EXAMPLE64_COMMAND})
 
         add_executable(minigzip64 test/minigzip.c)
         configure_test_executable(minigzip64)
@@ -879,8 +881,8 @@ if (ZLIB_ENABLE_TESTS)
         file(GLOB ALL_SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
         foreach(FUZZER ${FUZZERS})
             add_executable(${FUZZER}_fuzzer test/fuzz/${FUZZER}_fuzzer.c test/fuzz/standalone_fuzz_target_runner.c)
-            configure_test_executable(${FUZZER}_fuzzer)
-            add_test(${FUZZER}_fuzzer ${FUZZER}_fuzzer${CMAKE_EXECUTABLE_SUFFIX} ${ALL_SRC_FILES})
+            set(FUZZER_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:${FUZZER}_fuzzer> ${ALL_SRC_FILES})
+            add_test(NAME ${FUZZER}_fuzzer COMMAND ${FUZZER_COMMAND})
         endforeach()
     endif()
 
@@ -898,7 +900,8 @@ if (ZLIB_ENABLE_TESTS)
     if(NOT WIN32 AND ZLIB_COMPAT)
         add_executable(CVE-2003-0107 test/CVE-2003-0107.c)
         target_link_libraries(CVE-2003-0107 zlib)
-        add_test(NAME CVE-2003-0107 COMMAND CVE-2003-0107)
+        set(CVE20030107_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:CVE-2003-0107>)
+        add_test(NAME CVE-2003-0107 COMMAND ${CVE20030107_COMMAND})
     endif()
 
     set(MAKEFIXED_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:makefixed>)