From 96bf8be098b434ec19146d5724b60179ae56e00a Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Thu, 20 Nov 2014 08:46:02 -0600 Subject: update and mask unit tests when running on win32 Update pq_test to ignore changes in whitespace. Update for new testssl params, specify absolute paths to test binaries. Fork-based tests do not make sense on Windows. Disable building biotest, since it is too specific to OpenBSD's behavior to be useful on other platforms. --- tests/aeadtest.sh | 6 +++++- tests/evptest.sh | 6 +++++- tests/pq_test.sh | 6 +++++- tests/ssltest.sh | 20 +++++++++++++++++--- 4 files changed, 32 insertions(+), 6 deletions(-) (limited to 'tests') 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 -- cgit v1.2.3-55-g6feb