diff options
-rw-r--r-- | tests/Makefile.am | 2 | ||||
-rw-r--r-- | tests/cert-tests/Makefile.am | 4 | ||||
-rw-r--r-- | tests/cert-tests/data/userid.pem (renamed from tests/userid/userid.pem) | 0 | ||||
-rwxr-xr-x | tests/cert-tests/userid (renamed from tests/userid/userid) | 2 | ||||
-rw-r--r-- | tests/userid/Makefile.am | 31 |
5 files changed, 4 insertions, 35 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ed80f6ba0d..0c48d293dc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,7 +20,7 @@ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. SUBDIRS = . pkcs1-padding pkcs8-decode pkcs12-decode \ - userid cert-tests ocsp-tests key-tests sha2 safe-renegotiation dsa scripts ecdsa \ + cert-tests ocsp-tests key-tests sha2 safe-renegotiation dsa scripts ecdsa \ slow dtls srp windows if ENABLE_OPENPGP diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am index 87d372b6cd..664ee347cc 100644 --- a/tests/cert-tests/Makefile.am +++ b/tests/cert-tests/Makefile.am @@ -45,14 +45,14 @@ EXTRA_DIST = data/ca-no-pathlen.pem data/no-ca-or-pathlen.pem data/aki-cert.pem data/template-rsa-sha3-256.pem data/template-rsa-sha3-512.pem data/template-rsa-sha3-224.pem \ data/template-rsa-sha3-384.pem \ data/name-constraints-ip2.pem data/chain-md5.pem data/gost-cert.pem \ - templates/template-tlsfeature.tmpl \ + templates/template-tlsfeature.tmpl data/userid.pem \ data/template-tlsfeature.pem data/template-tlsfeature.csr \ templates/template-tlsfeature-crq.tmpl templates/arb-extensions.tmpl data/arb-extensions.pem \ data/arb-extensions.csr dist_check_SCRIPTS = pathlen aki certtool invalid-sig email \ pkcs7 pkcs7-broken-sigs privkey-import name-constraints certtool-long-cn crl provable-privkey \ - provable-dh + provable-dh userid if !HAVE_BUGGY_LIBIDN dist_check_SCRIPTS += certtool-utf8 diff --git a/tests/userid/userid.pem b/tests/cert-tests/data/userid.pem index 2f3474745b..2f3474745b 100644 --- a/tests/userid/userid.pem +++ b/tests/cert-tests/data/userid.pem diff --git a/tests/userid/userid b/tests/cert-tests/userid index b1c93fcf3a..912e0c94ad 100755 --- a/tests/userid/userid +++ b/tests/cert-tests/userid @@ -23,7 +23,7 @@ srcdir="${srcdir:-.}" CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -"${CERTTOOL}" --certificate-info --infile "${srcdir}/userid.pem" >out 2>&1 +"${CERTTOOL}" --certificate-info --infile "${srcdir}/data/userid.pem" >out 2>&1 RET=$? if [ ${RET} != 0 ]; then echo "Error in userid:" diff --git a/tests/userid/Makefile.am b/tests/userid/Makefile.am deleted file mode 100644 index ea06dd5388..0000000000 --- a/tests/userid/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## Process this file with automake to produce Makefile.in -# Copyright (C) 2006, 2008, 2010, 2012 Free Software Foundation, Inc. -# -# Author: Simon Josefsson -# -# This file is part of GnuTLS. -# -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This file is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this file; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -EXTRA_DIST = userid.pem - -dist_check_SCRIPTS = userid - -TESTS = userid - -TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \ - LC_ALL="C" \ - top_builddir="$(top_builddir)" \ - srcdir="$(srcdir)" |