4 files changed, 46 insertions, 0 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 91dc99a..07444d0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -292,6 +292,16 @@ add_executable(rsa_test rsa_test.c)
 target_link_libraries(rsa_test ${TESTS_LIBS})
 add_test(rsa_test rsa_test)
+# servertest
+add_executable(servertest servertest.c)
+target_link_libraries(servertest ${TESTS_LIBS})
+if(NOT MSVC)
+        add_test(servertest ${CMAKE_CURRENT_SOURCE_DIR}/servertest.sh)
+else()
+        add_test(servertest ${CMAKE_CURRENT_SOURCE_DIR}/servertest.bat)
+endif()
+set_tests_properties(servertest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
 # sha1test
 add_executable(sha1test sha1test.c)
 target_link_libraries(sha1test ${TESTS_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7c61203..a071dff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -294,6 +294,12 @@ TESTS += rsa_test
 check_PROGRAMS += rsa_test
 rsa_test_SOURCES = rsa_test.c
+# servertest
+TESTS += servertest.sh
+check_PROGRAMS += servertest
+servertest_SOURCES = servertest.c
+EXTRA_DIST += servertest.sh servertest.bat
 # sha1test
 TESTS += sha1test
 check_PROGRAMS += sha1test
diff --git a/tests/servertest.bat b/tests/servertest.bat
new file mode 100644
index 0000000..d3dd178
--- /dev/null
+++ b/tests/servertest.bat
@@ -0,0 +1,17 @@
+@echo off
+setlocal enabledelayedexpansion
+REM     servertest.bat
+set servertest_bin=Debug\servertest.exe
+if not exist %servertest_bin% exit /b 1
+if "%srcdir%"=="" (
+        set srcdir=.
+)
+%servertest_bin% %srcdir%\server.pem %srcdir%\server.pem %srcdir%\ca.pem
+if !errorlevel! neq 0 (
+        exit /b 1
+)
+endlocal
diff --git a/tests/servertest.sh b/tests/servertest.sh
new file mode 100755
index 0000000..f1efeb0
--- /dev/null
+++ b/tests/servertest.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+servertest_bin=./servertest
+if [ -e ./servertest.exe ]; then
+        servertest_bin=./servertest.exe
+fi
+if [ -z $srcdir ]; then
+        srcdir=.
+fi
+$servertest_bin $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 91dc99a..07444d0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt
@@ -292,6 +292,16 @@ add_executable(rsa_test rsa_test.c)
292	target_link_libraries(rsa_test ${TESTS_LIBS})	292	target_link_libraries(rsa_test ${TESTS_LIBS})
293	add_test(rsa_test rsa_test)	293	add_test(rsa_test rsa_test)
294		294
		295	# servertest
		296	add_executable(servertest servertest.c)
		297	target_link_libraries(servertest ${TESTS_LIBS})
		298	if(NOT MSVC)
		299	add_test(servertest ${CMAKE_CURRENT_SOURCE_DIR}/servertest.sh)
		300	else()
		301	add_test(servertest ${CMAKE_CURRENT_SOURCE_DIR}/servertest.bat)
		302	endif()
		303	set_tests_properties(servertest PROPERTIES ENVIRONMENT "srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
		304
295	# sha1test	305	# sha1test
296	add_executable(sha1test sha1test.c)	306	add_executable(sha1test sha1test.c)
297	target_link_libraries(sha1test ${TESTS_LIBS})	307	target_link_libraries(sha1test ${TESTS_LIBS})


diff --git a/tests/Makefile.am b/tests/Makefile.am index 7c61203..a071dff 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am
@@ -294,6 +294,12 @@ TESTS += rsa_test
294	check_PROGRAMS += rsa_test	294	check_PROGRAMS += rsa_test
295	rsa_test_SOURCES = rsa_test.c	295	rsa_test_SOURCES = rsa_test.c
296		296
		297	# servertest
		298	TESTS += servertest.sh
		299	check_PROGRAMS += servertest
		300	servertest_SOURCES = servertest.c
		301	EXTRA_DIST += servertest.sh servertest.bat
		302
297	# sha1test	303	# sha1test
298	TESTS += sha1test	304	TESTS += sha1test
299	check_PROGRAMS += sha1test	305	check_PROGRAMS += sha1test


diff --git a/tests/servertest.bat b/tests/servertest.bat new file mode 100644 index 0000000..d3dd178 --- /dev/null +++ b/tests/servertest.bat
@@ -0,0 +1,17 @@
		1	@echo off
		2	setlocal enabledelayedexpansion
		3	REM servertest.bat
		4
		5	set servertest_bin=Debug\servertest.exe
		6	if not exist %servertest_bin% exit /b 1
		7
		8	if "%srcdir%"=="" (
		9	set srcdir=.
		10	)
		11
		12	%servertest_bin% %srcdir%\server.pem %srcdir%\server.pem %srcdir%\ca.pem
		13	if !errorlevel! neq 0 (
		14	exit /b 1
		15	)
		16
		17	endlocal


diff --git a/tests/servertest.sh b/tests/servertest.sh new file mode 100755 index 0000000..f1efeb0 --- /dev/null +++ b/tests/servertest.sh
@@ -0,0 +1,13 @@
		1	#!/bin/sh
		2	set -e
		3
		4	servertest_bin=./servertest
		5	if [ -e ./servertest.exe ]; then
		6	servertest_bin=./servertest.exe
		7	fi
		8
		9	if [ -z $srcdir ]; then
		10	srcdir=.
		11	fi
		12
		13	$servertest_bin $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem