summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Kristian Rosbach <hk-git@circlestorm.org>2021-03-15 11:49:26 +0100
committerHans Kristian Rosbach <hk-github@circlestorm.org>2021-03-16 12:22:21 +0100
commit21b0e01a7167d97cc0a3147281ab4c306f9c23d1 (patch)
tree84368bb910924724b768268b848a78af2dbddbfc
parent04ae6d8b19ad32adf66138fb84c62fc7bf310334 (diff)
Add testing of minigzip/minideflate --help and invalid parameter
-rw-r--r--CMakeLists.txt3
-rw-r--r--cmake/test-tools.cmake35
2 files changed, 38 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 978b471..b57e1e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1202,6 +1202,9 @@ if(ZLIB_ENABLE_TESTS)
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
endforeach()
+ # Run tests targeting tools
+ include(cmake/test-tools.cmake)
+
if(NOT WIN32 AND ZLIB_COMPAT)
add_executable(CVE-2003-0107 test/CVE-2003-0107.c)
target_link_libraries(CVE-2003-0107 zlib)
diff --git a/cmake/test-tools.cmake b/cmake/test-tools.cmake
new file mode 100644
index 0000000..3275935
--- /dev/null
+++ b/cmake/test-tools.cmake
@@ -0,0 +1,35 @@
+# test-tools.cmake -- Tests targeting tool coverage
+
+# Test --help and invalid parameters for our tools
+set(TEST_COMMAND ${MINIGZIP_COMMAND} "--help")
+add_test(NAME minigzip-help
+ COMMAND ${CMAKE_COMMAND}
+ "-DCOMMAND=${TEST_COMMAND}"
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
+
+set(TEST_COMMAND ${MINIGZIP_COMMAND} "--invalid")
+add_test(NAME minigzip-invalid
+ COMMAND ${CMAKE_COMMAND}
+ "-DCOMMAND=${TEST_COMMAND}"
+ -DSUCCESS_EXIT=64
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
+
+set(TEST_COMMAND ${MINIDEFLATE_COMMAND} "--help")
+add_test(NAME minideflate-help
+ COMMAND ${CMAKE_COMMAND}
+ "-DCOMMAND=${TEST_COMMAND}"
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
+
+set(TEST_COMMAND ${MINIDEFLATE_COMMAND} "--invalid")
+add_test(NAME minideflate-invalid
+ COMMAND ${CMAKE_COMMAND}
+ "-DCOMMAND=${TEST_COMMAND}"
+ -DSUCCESS_EXIT=64
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
+
+set(TEST_COMMAND ${SWITCHLEVELS_COMMAND} "--help")
+add_test(NAME switchlevels-help
+ COMMAND ${CMAKE_COMMAND}
+ "-DCOMMAND=${TEST_COMMAND}"
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
+