diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-06-02 15:34:13 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-06-02 15:34:13 +0200 |
| commit | 6771e00280c1c9f3c9e0efcc2aa3603a111c8ee7 (patch) | |
| tree | f6b34491ad314725002c6b3ce7f32db5c6bc9edd | |
| parent | c2353d0ee03a8a5461495ec7e09b868c922bd24d (diff) | |
| download | gnutls-6771e00280c1c9f3c9e0efcc2aa3603a111c8ee7.tar.gz | |
several updates for tests to run under win32
| -rw-r--r-- | tests/cert-tests/Makefile.am | 6 | ||||
| -rwxr-xr-x | tests/cert-tests/pem-decoding | 4 | ||||
| -rw-r--r-- | tests/dsa/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/openpgp-certs/Makefile.am | 5 |
4 files changed, 13 insertions, 4 deletions
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am index ccc29ee97f..746e5c6ecd 100644 --- a/tests/cert-tests/Makefile.am +++ b/tests/cert-tests/Makefile.am @@ -27,7 +27,11 @@ EXTRA_DIST = ca-no-pathlen.pem no-ca-or-pathlen.pem aki-cert.pem \ dist_check_SCRIPTS = pathlen aki template-test pem-decoding dane -TESTS = pathlen aki template-test pem-decoding +TESTS = pathlen aki pem-decoding + +if !WINDOWS +TESTS += template-test +endif if ENABLE_DANE TESTS += dane diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding index f8c6372752..5414bf75bd 100755 --- a/tests/cert-tests/pem-decoding +++ b/tests/cert-tests/pem-decoding @@ -44,7 +44,7 @@ if test "$rc" != "0"; then exit $rc fi -diff $srcdir/bmpstring.pem tmp-pem.pem +diff --strip-trailing-cr $srcdir/bmpstring.pem tmp-pem.pem rc=$? if test "$rc" != "0"; then @@ -63,7 +63,7 @@ fi cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1 cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2 -diff tmp1 tmp2 +diff --strip-trailing-cr tmp1 tmp2 rc=$? if test "$rc" != "0"; then diff --git a/tests/dsa/Makefile.am b/tests/dsa/Makefile.am index 66028b7af5..99242418d2 100644 --- a/tests/dsa/Makefile.am +++ b/tests/dsa/Makefile.am @@ -23,6 +23,8 @@ EXTRA_DIST = cert.dsa.1024.pem cert.dsa.2048.pem cert.dsa.3072.pem dsa.1024.p dist_check_SCRIPTS = testdsa +if !WINDOWS TESTS = testdsa +endif TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) diff --git a/tests/openpgp-certs/Makefile.am b/tests/openpgp-certs/Makefile.am index f896635591..0058eb80bb 100644 --- a/tests/openpgp-certs/Makefile.am +++ b/tests/openpgp-certs/Makefile.am @@ -29,7 +29,10 @@ dist_check_SCRIPTS = testselfsigs testcerts if ENABLE_OPENPGP # The selftest is disabled until we can make it work under Wine and # under Debian buildds (problem with 127.0.0.2?). -TESTS = testselfsigs testcerts +TESTS = testselfsigs +if !WINDOWS +TESTS += testcerts +endif endif TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) |