diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-06-22 21:24:55 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-06-22 21:26:01 +0200 |
| commit | 1ffa4ef0213f0601bf71a7d48a9a0e6614ca54db (patch) | |
| tree | 74b8e7f69c630ce2caf5e49c5abe7066331d32eb /tests/suite | |
| parent | 3c4d62624eb0f8a0d4e0bc91dde4e97108360576 (diff) | |
| download | gnutls-1ffa4ef0213f0601bf71a7d48a9a0e6614ca54db.tar.gz | |
tests: moved test-ciphersuites.sh one level up
That simplifies running the script outside make check.
Diffstat (limited to 'tests/suite')
| -rw-r--r-- | tests/suite/Makefile.am | 2 | ||||
| -rwxr-xr-x | tests/suite/ciphersuite/scan-gnutls.sh | 4 | ||||
| -rwxr-xr-x | tests/suite/test-ciphersuite-names (renamed from tests/suite/ciphersuite/test-ciphersuites.sh) | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am index d91f4a6a21..1c2788cf53 100644 --- a/tests/suite/Makefile.am +++ b/tests/suite/Makefile.am @@ -90,7 +90,7 @@ nodist_check_SCRIPTS = eagain testsrn chain invalid-cert testrandom \ testrng testcompat-main-polarssl testcompat-main-openssl testcompat-common \ testcompat-polarssl testcompat-openssl -TESTS = ciphersuite/test-ciphersuites.sh eagain testsrn chain invalid-cert \ +TESTS = test-ciphersuite-names eagain testsrn chain invalid-cert \ testrng testcompat-openssl testcompat-polarssl if ENABLE_PKCS11 diff --git a/tests/suite/ciphersuite/scan-gnutls.sh b/tests/suite/ciphersuite/scan-gnutls.sh index 2a2379eb48..deafde492e 100755 --- a/tests/suite/ciphersuite/scan-gnutls.sh +++ b/tests/suite/ciphersuite/scan-gnutls.sh @@ -3,8 +3,8 @@ echo 'var gnutls_ciphersuites = {' -srcdir="${srcdir:-..}" -top_builddir="${top_builddir:-../../..}" +srcdir="${srcdir:-.}" +top_builddir="${top_builddir:-../..}" gcc -E "${srcdir}/../../lib/algorithms/ciphersuites.c" -I"${top_builddir}" -I"${srcdir}/../../lib" -DHAVE_CONFIG_H -DHAVE_LIBNETTLE -I"${srcdir}/../../gl" -I"${srcdir}/../includes" -DENABLE_DHE -DENABLE_ECDHE -DENABLE_PSK -DENABLE_ANON -DENABLE_SRP \ | awk '/^static const gnutls_cipher_suite_entry_st cs_algorithms/, /;/ { print; }' \ diff --git a/tests/suite/ciphersuite/test-ciphersuites.sh b/tests/suite/test-ciphersuite-names index 88306dd12a..84f7f53b18 100755 --- a/tests/suite/ciphersuite/test-ciphersuites.sh +++ b/tests/suite/test-ciphersuite-names @@ -1,7 +1,7 @@ #!/bin/sh -srcdir="${srcdir:-..}" -top_builddir="${top_builddir:-../../..}" +srcdir="${srcdir:-.}" +top_builddir="${top_builddir:-../..}" nodejs --help >/dev/null 2>&1 if test $? = 0; then |