diff options
| author | Brent Cook <busterb@gmail.com> | 2014-11-20 08:46:02 -0600 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2014-12-03 17:02:29 -0600 |
| commit | 96bf8be098b434ec19146d5724b60179ae56e00a (patch) | |
| tree | d711ef8bff8a7e6f8633dee953cb7565959b3e54 /tests | |
| parent | 58fcd3c39c73d83eb9782a8ef935498b18b5ae73 (diff) | |
| download | portable-96bf8be098b434ec19146d5724b60179ae56e00a.tar.gz portable-96bf8be098b434ec19146d5724b60179ae56e00a.tar.bz2 portable-96bf8be098b434ec19146d5724b60179ae56e00a.zip | |
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.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/aeadtest.sh | 6 | ||||
| -rwxr-xr-x | tests/evptest.sh | 6 | ||||
| -rwxr-xr-x | tests/pq_test.sh | 6 | ||||
| -rwxr-xr-x | tests/ssltest.sh | 20 |
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 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | set -e | 2 | set -e |
| 3 | ./aeadtest $srcdir/aeadtests.txt | 3 | TEST=./aeadtest |
| 4 | if [ -e ./aeadtest.exe ]; then | ||
| 5 | TEST=./aeadtest.exe | ||
| 6 | fi | ||
| 7 | $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 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | set -e | 2 | set -e |
| 3 | ./evptest $srcdir/evptests.txt | 3 | TEST=./evptest |
| 4 | if [ -e ./evptest.exe ]; then | ||
| 5 | TEST=./evptest.exe | ||
| 6 | fi | ||
| 7 | $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 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | set -e | 2 | set -e |
| 3 | ./pq_test | cmp $srcdir/pq_expected.txt - | 3 | TEST=./pq_test |
| 4 | if [ -e ./pq_test.exe ]; then | ||
| 5 | TEST=./pq_test.exe | ||
| 6 | fi | ||
| 7 | $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 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | set -e | 2 | set -e |
| 3 | PATH=../apps:$PATH | 3 | |
| 4 | export PATH | 4 | ssltest_bin=./ssltest |
| 5 | $srcdir/testssl $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem | 5 | if [ -e ./ssltest.exe ]; then |
| 6 | ssltest_bin=./ssltest.exe | ||
| 7 | fi | ||
| 8 | |||
| 9 | openssl_bin=../apps/openssl | ||
| 10 | if [ -e ../apps/openssl.exe ]; then | ||
| 11 | openssl_bin=../apps/openssl.exe | ||
| 12 | fi | ||
| 13 | |||
| 14 | if [ -z $srcdir ]; then | ||
| 15 | srcdir=. | ||
| 16 | fi | ||
| 17 | |||
| 18 | $srcdir/testssl $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem \ | ||
| 19 | $ssltest_bin $openssl_bin | ||
