4 files changed, 32 insertions, 6 deletions

diff --git a/tests/aeadtest.sh b/tests/aeadtest.sh
index d51dd29..132b1fd 100755
--- a/tests/aeadtest.sh
+++ b/tests/aeadtest.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
 set -e
-./aeadtest $srcdir/aeadtests.txt
+TEST=./aeadtest
+if [ -e ./aeadtest.exe ]; then
+        TEST=./aeadtest.exe
+fi
+$TEST $srcdir/aeadtests.txt
diff --git a/tests/evptest.sh b/tests/evptest.sh
index 8e1d106..ba44d75 100755
--- a/tests/evptest.sh
+++ b/tests/evptest.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
 set -e
-./evptest $srcdir/evptests.txt
+TEST=./evptest
+if [ -e ./evptest.exe ]; then
+        TEST=./evptest.exe
+fi
+$TEST $srcdir/evptests.txt
diff --git a/tests/pq_test.sh b/tests/pq_test.sh
index b6b9f5e..ab87bc7 100755
--- a/tests/pq_test.sh
+++ b/tests/pq_test.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
 set -e
-./pq_test | cmp $srcdir/pq_expected.txt -
+TEST=./pq_test
+if [ -e ./pq_test.exe ]; then
+        TEST=./pq_test.exe
+fi
+$TEST | diff -b $srcdir/pq_expected.txt -
diff --git a/tests/ssltest.sh b/tests/ssltest.sh
index 476a258..1b4c9c7 100755
--- a/tests/ssltest.sh
+++ b/tests/ssltest.sh
@@ -1,5 +1,19 @@
 #!/bin/sh
 set -e
-PATH=../apps:$PATH
-export PATH
-$srcdir/testssl $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem
+
+ssltest_bin=./ssltest
+if [ -e ./ssltest.exe ]; then
+        ssltest_bin=./ssltest.exe
+fi
+
+openssl_bin=../apps/openssl
+if [ -e ../apps/openssl.exe ]; then
+        openssl_bin=../apps/openssl.exe
+fi
+
+if [ -z $srcdir ]; then
+        srcdir=.
+fi
+
+$srcdir/testssl $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem \
+        $ssltest_bin $openssl_bin