From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 22 Jun 2015 19:24:55 +0000 (+0200)
Subject: tests: moved test-ciphersuites.sh one level up
X-Git-Tag: gnutls_3_4_3~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ffa4ef0213f0601bf71a7d48a9a0e6614ca54db;p=thirdparty%2Fgnutls.git

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 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
similarity index 88%
rename from tests/suite/ciphersuite/test-ciphersuites.sh
rename to 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