tests: long-crl.sh was moved to main suite

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

5 files changed, 7 insertions, 8 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index af3902aaf0..15ce1908ff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -64,8 +64,7 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h cert-common.h test-chains.h \
 	data/listings-SSL3.0-TLS1.1 p11-kit-trust-data/Example_Root_CA.p11-kit server-kx-neg-common.c \
 	p11-kit-trust-data/Example_Root_CA.pem data/test1.cat data/test2.cat \
 	data/test1.cat.data data/test2.cat.data data/test1.cat.out data/test2.cat.out \
-	data/pkcs7-cat-ca.pem
-
+	data/pkcs7-cat-ca.pem data/long.crl data/long.pem
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = \
@@ -385,7 +384,7 @@ dist_check_SCRIPTS += fastopen.sh pkgconfig.sh starttls.sh starttls-ftp.sh start
 	ocsp-tests/ocsp-tls-connection ocsp-tests/ocsp-must-staple-connection \
 	ocsp-tests/ocsp-test cipher-listings.sh sni-hostname.sh server-multi-keys.sh \
 	psktool.sh ocsp-tests/ocsp-load-chain gnutls-cli-save-data.sh gnutls-cli-debug.sh \
-	sni-resume.sh ocsp-tests/ocsptool cert-reencoding.sh pkcs7-cat.sh
+	sni-resume.sh ocsp-tests/ocsptool cert-reencoding.sh pkcs7-cat.sh long-crl.sh
 
 dist_check_SCRIPTS += gnutls-cli-self-signed.sh
 
diff --git a/tests/suite/crl/long.crl b/tests/data/long.crl
index 5dea927e7f..5dea927e7f 100644
--- a/tests/suite/crl/long.crl
+++ b/tests/data/long.crl
diff --git a/tests/suite/crl/long.pem b/tests/data/long.pem
index ec5c762ad3..ec5c762ad3 100644
--- a/tests/suite/crl/long.pem
+++ b/tests/data/long.pem
diff --git a/tests/suite/crl-test b/tests/long-crl.sh
index 2f52c94496..74327e36c6 100755
--- a/tests/suite/crl-test
+++ b/tests/long-crl.sh
@@ -22,7 +22,7 @@
 
 srcdir="${srcdir:-.}"
 DIFF="${DIFF:-diff}"
-CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}"
+CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}"
 
 if ! test -x "${CERTTOOL}"; then
 	exit 77
@@ -35,7 +35,7 @@ fi
 TMPFILE=long.$$.pem.tmp
 
 rm -f $TMPFILE
-${VALGRIND} "${CERTTOOL}" --crl-info --inder --infile "${srcdir}/crl/long.crl" --outfile $TMPFILE
+${VALGRIND} "${CERTTOOL}" --crl-info --inder --infile "${srcdir}/data/long.crl" --outfile $TMPFILE
 rc=$?
 
 # We're done.
@@ -44,7 +44,7 @@ if test "${rc}" != "0"; then
 	exit ${rc}
 fi
 
-${DIFF} -I ^warning "${srcdir}/crl/long.pem" "$TMPFILE" || ${DIFF} -I ^warning --strip-trailing-cr "${srcdir}/crl/long.pem" $TMPFILE
+${DIFF} -I ^warning "${srcdir}/data/long.pem" "$TMPFILE" || ${DIFF} -I ^warning --strip-trailing-cr "${srcdir}/data/long.pem" $TMPFILE
 rc=$?
 
 if test "${rc}" != "0"; then
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index 7f232f3417..6e784fff8e 100644
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -31,7 +31,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/tests/suite/ecore/src/include \
 	-I$(top_srcdir)/tests/suite/ecore/src/lib
 
-EXTRA_DIST = crl/long.crl crl/long.pem
+EXTRA_DIST =
 
 check_PROGRAMS = rng prime-check
 AM_LDFLAGS = -no-install
@@ -93,7 +93,7 @@ nodist_check_SCRIPTS = chain.sh invalid-cert.sh \
 	tls-fuzzer/tls-fuzzer-cert.sh tls-fuzzer/tls-fuzzer-alpn.sh
 
 if ENABLE_PKCS11
-nodist_check_SCRIPTS += testpkcs11.sh crl-test
+nodist_check_SCRIPTS += testpkcs11.sh
 endif
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \