3 files changed, 18 insertions, 2 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e6cb2bc..efa6e04 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -21,7 +21,12 @@ file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} TEST_SOURCE_DIR)
 # aeadtest
 add_executable(aeadtest aeadtest.c)
 target_link_libraries(aeadtest ${OPENSSL_TEST_LIBS})
-add_test(aeadtest aeadtest ${CMAKE_CURRENT_SOURCE_DIR}/aeadtests.txt)
+if(NOT WIN32)
+        add_test(NAME aeadtest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/aeadtest.sh)
+        set_tests_properties(aeadtest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
+else()
+        add_test(aeadtest aeadtest aead ${CMAKE_CURRENT_SOURCE_DIR}/aeadtests.txt)
+endif()
 
 # aes_wrap
 add_executable(aes_wrap aes_wrap.c)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5f768e2..3be2f3f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,6 +34,11 @@ check_PROGRAMS += aeadtest
 aeadtest_SOURCES = aeadtest.c
 EXTRA_DIST += aeadtest.sh
 EXTRA_DIST += aeadtests.txt
+EXTRA_DIST += aes_128_gcm_tests.txt
+EXTRA_DIST += aes_192_gcm_tests.txt
+EXTRA_DIST += aes_256_gcm_tests.txt
+EXTRA_DIST += chacha20_poly1305_tests.txt
+EXTRA_DIST += xchacha20_poly1305_tests.txt
 
 # aes_wrap
 TESTS += aes_wrap
diff --git a/tests/aeadtest.sh b/tests/aeadtest.sh
index 132b1fd..9f59595 100755
--- a/tests/aeadtest.sh
+++ b/tests/aeadtest.sh
@@ -4,4 +4,10 @@ TEST=./aeadtest
 if [ -e ./aeadtest.exe ]; then
         TEST=./aeadtest.exe
 fi
-$TEST $srcdir/aeadtests.txt
+$TEST aead $srcdir/aeadtests.txt
+$TEST aes-128-gcm $srcdir/aes_128_gcm_tests.txt
+$TEST aes-192-gcm $srcdir/aes_192_gcm_tests.txt
+$TEST aes-256-gcm $srcdir/aes_256_gcm_tests.txt
+$TEST chacha20-poly1305 $srcdir/chacha20_poly1305_tests.txt
+$TEST xchacha20-poly1305 $srcdir/xchacha20_poly1305_tests.txt
+