tests: moved test-ciphersuites.sh one level up

That simplifies running the script outside make check.

diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index d91f4a6a21875630a773a0481edc59a6cc081b37..1c2788cf53b3b32dbfa0c89fbedf4f74817b1959 100644 (file)
--- 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 2a2379eb48ec01942601958f3bf54f539066d969..deafde492ea8be323fc32cb891c55d239fa15a27 100755 (executable)
--- 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
similarity index 88%
rename from tests/suite/ciphersuite/test-ciphersuites.sh
rename to tests/suite/test-ciphersuite-names
index 88306dd12ae55cccfbddd2da3b620358b9608895..84f7f53b1852acd1efca4edb40b1f60d6e663844 100755 (executable)
--- 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