Add shutdowntest to build

4 files changed, 44 insertions, 0 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 828574e..d77a9f0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -601,6 +601,17 @@ add_executable(sha_test sha_test.c)
 target_link_libraries(sha_test ${OPENSSL_TEST_LIBS})
 add_test(sha_test sha_test)
 
+# shutdowntest
+set(SHUTDOWNTEST_SRC shutdowntest.c)
+add_executable(shutdowntest ${SHUTDOWNTEST_SRC})
+target_link_libraries(shutdowntest ${OPENSSL_TEST_LIBS})
+if(NOT MSVC)
+        add_test(NAME shutdowntest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/shutdowntest.sh)
+else()
+        add_test(NAME shutdowntest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/shutdowntest.bat $<TARGET_FILE:shutdowntest>)
+endif()
+set_tests_properties(shutdowntest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
+
 # signertest
 if(NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
         set(SIGNERTEST_SRC signertest.c)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dc9ccd3..a93e7fc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -631,6 +631,12 @@ TESTS += sha_test
 check_PROGRAMS += sha_test
 sha_test_SOURCES = sha_test.c
 
+# shutdowntest
+TESTS += shutdowntest.sh
+check_PROGRAMS += shutdowntest
+shutdowntest_SOURCES = shutdowntest.c
+EXTRA_DIST += shutdowntest.sh shutdowntest.bat
+
 # signertest
 TESTS += signertest
 check_PROGRAMS += signertest
diff --git a/tests/shutdowntest.bat b/tests/shutdowntest.bat
new file mode 100644
index 0000000..46db6e8
--- /dev/null
+++ b/tests/shutdowntest.bat
@@ -0,0 +1,14 @@
+@echo off

+setlocal enabledelayedexpansion

+REM     shutdowntest.bat

+

+set shutdowntest_bin=%1

+set shutdowntest_bin=%shutdowntest_bin:/=\%

+if not exist %shutdowntest_bin% exit /b 1

+

+%shutdowntest_bin% %srcdir%\server.pem %srcdir%\server.pem %srcdir%\ca.pem

+if !errorlevel! neq 0 (

+        exit /b 1

+)

+

+endlocal

diff --git a/tests/shutdowntest.sh b/tests/shutdowntest.sh
new file mode 100755
index 0000000..22e2b1d
--- /dev/null
+++ b/tests/shutdowntest.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+shutdowntest_bin=./shutdowntest
+if [ -e ./shutdowntest.exe ]; then
+        shutdowntest_bin=./shutdowntest.exe
+fi
+
+if [ -z $srcdir ]; then
+        srcdir=.
+fi
+
+$shutdowntest_bin $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem