diff options
| author | Daiki Ueno <ueno@gnu.org> | 2020-09-23 09:09:45 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-09-25 10:53:34 +0200 |
| commit | 1fff6592f0ca98d0ea7799f92c12f66eae5b569c (patch) | |
| tree | f82d6792b32c0a071d97d80faab8ce7027feefc4 | |
| parent | 1925d9bfe3bcd59109e0bfbb8651081f86fa413c (diff) | |
| download | gnutls-1fff6592f0ca98d0ea7799f92c12f66eae5b569c.tar.gz | |
tests: use ": ${FOO=BAR}" syntax for default handling in shell scripts
Signed-off-by: Daiki Ueno <ueno@gnu.org>
157 files changed, 438 insertions, 438 deletions
diff --git a/fuzz/run-afl.sh b/fuzz/run-afl.sh index 68f77f8ce1..ee1283f6fb 100755 --- a/fuzz/run-afl.sh +++ b/fuzz/run-afl.sh @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" +: ${srcdir=.} export LD_LIBRARY_PATH=${srcdir}/../lib/.libs/ cat ${srcdir}/../config.log|grep afl-gcc >/dev/null 2>&1 diff --git a/tests/cert-reencoding.sh b/tests/cert-reencoding.sh index 3469c42d22..8b147fc823 100755 --- a/tests/cert-reencoding.sh +++ b/tests/cert-reencoding.sh @@ -21,13 +21,13 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" -OCSPTOOL="${OCSPTOOL:-../src/ocsptool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../src/certtool${EXEEXT}} +: ${OCSPTOOL=../src/ocsptool${EXEEXT}} GNUTLS_SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" unset SERV -GNUTLS_CLI="${GNUTLS_CLI:-../src/gnutls-cli${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${GNUTLS_CLI=../src/gnutls-cli${EXEEXT}} +: ${DIFF=diff} SERVER_CERT_FILE="cert.$$.pem.tmp" SERVER_KEY_FILE="key.$$.pem.tmp" CLIENT_CERT_FILE="cli-cert.$$.pem.tmp" diff --git a/tests/cert-tests/aki b/tests/cert-tests/aki index e8d39588e3..b7bbe91c1c 100755 --- a/tests/cert-tests/aki +++ b/tests/cert-tests/aki @@ -22,10 +22,10 @@ set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TMPFILE=aki-$$.tmp -DIFF="${DIFF:-diff -b -B}" +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/alt-chain b/tests/cert-tests/alt-chain index a2261b3809..d72bfa41d6 100755 --- a/tests/cert-tests/alt-chain +++ b/tests/cert-tests/alt-chain @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/cert-critical b/tests/cert-tests/cert-critical index f923b29fa4..5734c3fe00 100755 --- a/tests/cert-tests/cert-critical +++ b/tests/cert-tests/cert-critical @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/cert-non-digits-time b/tests/cert-tests/cert-non-digits-time index 9c25c396de..1c72a9c675 100755 --- a/tests/cert-tests/cert-non-digits-time +++ b/tests/cert-tests/cert-non-digits-time @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/cert-sanity b/tests/cert-tests/cert-sanity index 4bf0a0cf85..c2d63d966c 100755 --- a/tests/cert-tests/cert-sanity +++ b/tests/cert-tests/cert-sanity @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/cert-time b/tests/cert-tests/cert-time index 6ee2a226e6..3310250289 100755 --- a/tests/cert-tests/cert-time +++ b/tests/cert-tests/cert-time @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/certtool b/tests/cert-tests/certtool index 0fd29beea9..4b194ac9ca 100755 --- a/tests/cert-tests/certtool +++ b/tests/cert-tests/certtool @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE1=certtool-file1.$$.tmp TMPFILE2=certtool-file2.$$.tmp PASS="1234" diff --git a/tests/cert-tests/certtool-crl-decoding b/tests/cert-tests/certtool-crl-decoding index dadc92cbf7..7480150ba1 100755 --- a/tests/cert-tests/certtool-crl-decoding +++ b/tests/cert-tests/certtool-crl-decoding @@ -22,8 +22,8 @@ # This checks whether OIDs > 2^32 are correctly decoded. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} OUTFILE="crl.$$.pem" if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/certtool-ecdsa b/tests/cert-tests/certtool-ecdsa index 9811777b1f..885efe243f 100755 --- a/tests/cert-tests/certtool-ecdsa +++ b/tests/cert-tests/certtool-ecdsa @@ -20,8 +20,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} KEYFILE=ecdsa-privkey.$$.tmp TMPFILE=ecdsa.$$.tmp diff --git a/tests/cert-tests/certtool-eddsa b/tests/cert-tests/certtool-eddsa index 7e07822507..2fc027a95b 100755 --- a/tests/cert-tests/certtool-eddsa +++ b/tests/cert-tests/certtool-eddsa @@ -20,8 +20,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} KEYFILE=eddsa-privkey.$$.tmp TMPFILE=eddsa.$$.tmp TMPFILE2=eddsa2.$$.tmp diff --git a/tests/cert-tests/certtool-long-cn b/tests/cert-tests/certtool-long-cn index 41e7a9740c..9614bdf59a 100755 --- a/tests/cert-tests/certtool-long-cn +++ b/tests/cert-tests/certtool-long-cn @@ -22,9 +22,9 @@ # This checks whether invalid UTF8 strings trigger valgrind warnings. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} outfile="out.$$.pem" if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/certtool-long-oids b/tests/cert-tests/certtool-long-oids index 17e1a40d53..7aa0cc965a 100755 --- a/tests/cert-tests/certtool-long-oids +++ b/tests/cert-tests/certtool-long-oids @@ -22,9 +22,9 @@ # This checks whether OIDs > 2^32 are correctly decoded. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} OUTFILE="long-oids.$$.pem.tmp" TMPFILE1="long-oids1.$$.pem.tmp" diff --git a/tests/cert-tests/certtool-rsa-pss b/tests/cert-tests/certtool-rsa-pss index 654bf34869..598351d41d 100755 --- a/tests/cert-tests/certtool-rsa-pss +++ b/tests/cert-tests/certtool-rsa-pss @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} OUTFILE=cert-pss-privkey.$$.tmp TMPFILE=cert-pss.$$.tmp TMPFILE2=cert2-pss.$$.tmp diff --git a/tests/cert-tests/certtool-subca b/tests/cert-tests/certtool-subca index 6bd5d94def..478d1f0d0b 100755 --- a/tests/cert-tests/certtool-subca +++ b/tests/cert-tests/certtool-subca @@ -24,9 +24,9 @@ # This is a reproducer for #767 -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/certtool-utf8 b/tests/cert-tests/certtool-utf8 index a814c08e12..b37b305f90 100755 --- a/tests/cert-tests/certtool-utf8 +++ b/tests/cert-tests/certtool-utf8 @@ -22,9 +22,9 @@ # This checks whether invalid UTF8 strings trigger valgrind warnings. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" diff --git a/tests/cert-tests/certtool-verify-profiles b/tests/cert-tests/certtool-verify-profiles index a4d738627e..f63ee923fe 100755 --- a/tests/cert-tests/certtool-verify-profiles +++ b/tests/cert-tests/certtool-verify-profiles @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/crl b/tests/cert-tests/crl index f4f97d757b..56ed5e5847 100755 --- a/tests/cert-tests/crl +++ b/tests/cert-tests/crl @@ -22,10 +22,10 @@ export TZ="UTC" -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" -ac_cv_sizeof_time_t="${ac_cv_sizeof_time_t:-8}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} +: ${ac_cv_sizeof_time_t=8} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/crq b/tests/cert-tests/crq index 1d64dee27e..60b161f6d8 100755 --- a/tests/cert-tests/crq +++ b/tests/cert-tests/crq @@ -22,9 +22,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/dane b/tests/cert-tests/dane index 66a1f30817..9398c73dcc 100755 --- a/tests/cert-tests/dane +++ b/tests/cert-tests/dane @@ -22,9 +22,9 @@ set -e -srcdir="${srcdir:-.}" -DANETOOL="${DANETOOL:-../../src/danetool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${DANETOOL=../../src/danetool${EXEEXT}} +: ${DIFF=diff} test -e "${DANETOOL}" || exit 77 diff --git a/tests/cert-tests/dsa b/tests/cert-tests/dsa index f8901c8c3e..ed3821e932 100755 --- a/tests/cert-tests/dsa +++ b/tests/cert-tests/dsa @@ -20,13 +20,13 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../../src/gnutls-serv}" -CLI="${CLI:-../../src/gnutls-cli}" +: ${srcdir=.} +: ${SERV=../../src/gnutls-serv} +: ${CLI=../../src/gnutls-cli} DEBUG="" unset RETCODE -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/ecdsa b/tests/cert-tests/ecdsa index c593351b57..431b88f06e 100755 --- a/tests/cert-tests/ecdsa +++ b/tests/cert-tests/ecdsa @@ -22,8 +22,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TMPFILE=ecdsa.$$.tmp TMPCA=ecdsa-ca.$$.tmp TMPCAKEY=ecdsa-ca-key.$$.tmp diff --git a/tests/cert-tests/email b/tests/cert-tests/email index a00281028e..1629fec881 100755 --- a/tests/cert-tests/email +++ b/tests/cert-tests/email @@ -20,8 +20,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} DIFF=$"{DIFF:-diff}" if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/gost b/tests/cert-tests/gost index ff47988a6d..c16c539814 100755 --- a/tests/cert-tests/gost +++ b/tests/cert-tests/gost @@ -21,8 +21,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TMPFILE=gost.$$.tmp TMPCA=gost-ca.$$.tmp TMPCAKEY=gost-ca-key.$$.tmp diff --git a/tests/cert-tests/illegal-rsa b/tests/cert-tests/illegal-rsa index 1b9a162779..d0cb611bc9 100755 --- a/tests/cert-tests/illegal-rsa +++ b/tests/cert-tests/illegal-rsa @@ -18,9 +18,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -GREP="${GREP:-grep}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${GREP=grep} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/inhibit-anypolicy b/tests/cert-tests/inhibit-anypolicy index ba5e1100f6..e27e4a85f7 100755 --- a/tests/cert-tests/inhibit-anypolicy +++ b/tests/cert-tests/inhibit-anypolicy @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/invalid-sig b/tests/cert-tests/invalid-sig index 58134a4d09..53ef76051b 100755 --- a/tests/cert-tests/invalid-sig +++ b/tests/cert-tests/invalid-sig @@ -22,9 +22,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" fi diff --git a/tests/cert-tests/key-id b/tests/cert-tests/key-id index 2e59593a3f..9c88035e87 100755 --- a/tests/cert-tests/key-id +++ b/tests/cert-tests/key-id @@ -22,8 +22,8 @@ set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TMPFILE=key-id.$$.tmp TEMPLFILE=tmpl.$$.tmp diff --git a/tests/cert-tests/key-invalid b/tests/cert-tests/key-invalid index eeb94ee976..975687fe7a 100755 --- a/tests/cert-tests/key-invalid +++ b/tests/cert-tests/key-invalid @@ -21,9 +21,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE=key-invalid.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/krb5-test b/tests/cert-tests/krb5-test index a6e092cc90..caa7d542d0 100755 --- a/tests/cert-tests/krb5-test +++ b/tests/cert-tests/krb5-test @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=tmp-krb5name.pem TMPLFILE=tmp-krb5name.tmpl diff --git a/tests/cert-tests/md5-test b/tests/cert-tests/md5-test index 15d6280b1c..7438e091f5 100755 --- a/tests/cert-tests/md5-test +++ b/tests/cert-tests/md5-test @@ -21,9 +21,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} TMPFILE=md5.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/name-constraints b/tests/cert-tests/name-constraints index 3b2370d49a..e0c1e7479d 100755 --- a/tests/cert-tests/name-constraints +++ b/tests/cert-tests/name-constraints @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/othername-test b/tests/cert-tests/othername-test index 00f93b22dd..40eb6c12bb 100755 --- a/tests/cert-tests/othername-test +++ b/tests/cert-tests/othername-test @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=tmp-othername.pem if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/pathlen b/tests/cert-tests/pathlen index d532012295..b5cd7d7107 100755 --- a/tests/cert-tests/pathlen +++ b/tests/cert-tests/pathlen @@ -22,9 +22,9 @@ set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding index 267a1fc7f3..dc9380c74b 100755 --- a/tests/cert-tests/pem-decoding +++ b/tests/cert-tests/pem-decoding @@ -22,8 +22,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs1-pad b/tests/cert-tests/pkcs1-pad index c75ab9e09d..c8f34e4144 100755 --- a/tests/cert-tests/pkcs1-pad +++ b/tests/cert-tests/pkcs1-pad @@ -23,8 +23,8 @@ set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs12 b/tests/cert-tests/pkcs12 index f28230a7b2..a04b043c8e 100755 --- a/tests/cert-tests/pkcs12 +++ b/tests/cert-tests/pkcs12 @@ -21,8 +21,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 @@ -37,7 +37,7 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=1" fi -DIFF="${DIFF:-diff}" +: ${DIFF=diff} DEBUG="" TMPFILE=pkcs12.$$.tmp diff --git a/tests/cert-tests/pkcs12-corner-cases b/tests/cert-tests/pkcs12-corner-cases index 0b9c482db7..2c6a2d9f2d 100755 --- a/tests/cert-tests/pkcs12-corner-cases +++ b/tests/cert-tests/pkcs12-corner-cases @@ -21,8 +21,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs12-encode b/tests/cert-tests/pkcs12-encode index 265c0df542..2f719f3044 100755 --- a/tests/cert-tests/pkcs12-encode +++ b/tests/cert-tests/pkcs12-encode @@ -21,8 +21,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 @@ -37,7 +37,7 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=1" fi -DIFF="${DIFF:-diff -b -B}" +: ${DIFF=diff -b -B} DEBUG="" TMPFILE=pkcs12.$$.tmp diff --git a/tests/cert-tests/pkcs12-gost b/tests/cert-tests/pkcs12-gost index f7c4bba52b..ab94479ba7 100755 --- a/tests/cert-tests/pkcs12-gost +++ b/tests/cert-tests/pkcs12-gost @@ -22,8 +22,8 @@ # This test cannot run under windows because it passes UTF8 data on command # line. This seems not to work under windows. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 @@ -38,7 +38,7 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=1" fi -DIFF="${DIFF:-diff}" +: ${DIFF=diff} DEBUG="" TMPFILE=pkcs12-gost.$$.tmp diff --git a/tests/cert-tests/pkcs12-utf8 b/tests/cert-tests/pkcs12-utf8 index ace10ca181..168e7c5126 100755 --- a/tests/cert-tests/pkcs12-utf8 +++ b/tests/cert-tests/pkcs12-utf8 @@ -25,8 +25,8 @@ # line. This seems not to work under windows. It intentionally depends on # bash as few other shells cannot handle utf8 strings -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 @@ -36,7 +36,7 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=1" fi -DIFF="${DIFF:-diff}" +: ${DIFF=diff} DEBUG="" TMPFILE=pkcs12-utf8.$$.tmp diff --git a/tests/cert-tests/pkcs7 b/tests/cert-tests/pkcs7 index 5767e09646..709ee5c07f 100755 --- a/tests/cert-tests/pkcs7 +++ b/tests/cert-tests/pkcs7 @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-broken-sigs b/tests/cert-tests/pkcs7-broken-sigs index b9351a055a..b51d0c5d15 100755 --- a/tests/cert-tests/pkcs7-broken-sigs +++ b/tests/cert-tests/pkcs7-broken-sigs @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-cat b/tests/cert-tests/pkcs7-cat index 6543397431..1cec37f4de 100755 --- a/tests/cert-tests/pkcs7-cat +++ b/tests/cert-tests/pkcs7-cat @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-constraints b/tests/cert-tests/pkcs7-constraints index 6964d26f09..150c103443 100755 --- a/tests/cert-tests/pkcs7-constraints +++ b/tests/cert-tests/pkcs7-constraints @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-constraints2 b/tests/cert-tests/pkcs7-constraints2 index 7d1816a33a..94f89a5e93 100755 --- a/tests/cert-tests/pkcs7-constraints2 +++ b/tests/cert-tests/pkcs7-constraints2 @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-eddsa b/tests/cert-tests/pkcs7-eddsa index 6f235c512b..40179703bc 100755 --- a/tests/cert-tests/pkcs7-eddsa +++ b/tests/cert-tests/pkcs7-eddsa @@ -19,9 +19,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs7-list-sign b/tests/cert-tests/pkcs7-list-sign index 5ca04d8005..2cf168bea4 100755 --- a/tests/cert-tests/pkcs7-list-sign +++ b/tests/cert-tests/pkcs7-list-sign @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/pkcs8 b/tests/cert-tests/pkcs8 index d23aad94b4..8bad70193e 100755 --- a/tests/cert-tests/pkcs8 +++ b/tests/cert-tests/pkcs8 @@ -18,9 +18,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -GREP="${GREP:-grep}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${GREP=grep} TMPFILE=tmp-key-ca.$$.p8 diff --git a/tests/cert-tests/pkcs8-decode b/tests/cert-tests/pkcs8-decode index 2fb8696626..27c84bfaf3 100755 --- a/tests/cert-tests/pkcs8-decode +++ b/tests/cert-tests/pkcs8-decode @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE=pkcs8-decode.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/pkcs8-eddsa b/tests/cert-tests/pkcs8-eddsa index 7474078ff6..2d33ebfb50 100755 --- a/tests/cert-tests/pkcs8-eddsa +++ b/tests/cert-tests/pkcs8-eddsa @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE=pkcs8-eddsa.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/pkcs8-gost b/tests/cert-tests/pkcs8-gost index 325b47a581..6527d9d369 100755 --- a/tests/cert-tests/pkcs8-gost +++ b/tests/cert-tests/pkcs8-gost @@ -19,9 +19,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE=pkcs8-gost-decode.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/pkcs8-invalid b/tests/cert-tests/pkcs8-invalid index a9e8beac21..edf19bbeec 100755 --- a/tests/cert-tests/pkcs8-invalid +++ b/tests/cert-tests/pkcs8-invalid @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} TMPFILE=pkcs8-invalid.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/privkey-import b/tests/cert-tests/privkey-import index 73bacae253..575ca58497 100755 --- a/tests/cert-tests/privkey-import +++ b/tests/cert-tests/privkey-import @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} TMPFILE=tmp-$$.privkey.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-dh b/tests/cert-tests/provable-dh index 0676c0f5f0..50d51ce4b7 100755 --- a/tests/cert-tests/provable-dh +++ b/tests/cert-tests/provable-dh @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-dh$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-dh-default b/tests/cert-tests/provable-dh-default index 43c2ed5aff..f6fa889814 100755 --- a/tests/cert-tests/provable-dh-default +++ b/tests/cert-tests/provable-dh-default @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-dh$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-privkey b/tests/cert-tests/provable-privkey index 51d4389eb7..0049c6d949 100755 --- a/tests/cert-tests/provable-privkey +++ b/tests/cert-tests/provable-privkey @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-privkey$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-privkey-dsa2048 b/tests/cert-tests/provable-privkey-dsa2048 index f805ab3576..f7eee5daf1 100755 --- a/tests/cert-tests/provable-privkey-dsa2048 +++ b/tests/cert-tests/provable-privkey-dsa2048 @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-privkey.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-privkey-gen-default b/tests/cert-tests/provable-privkey-gen-default index 3edf3437d8..6517a242a5 100755 --- a/tests/cert-tests/provable-privkey-gen-default +++ b/tests/cert-tests/provable-privkey-gen-default @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-privkey$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/provable-privkey-rsa2048 b/tests/cert-tests/provable-privkey-rsa2048 index f846476e7e..7f6b4090cf 100755 --- a/tests/cert-tests/provable-privkey-rsa2048 +++ b/tests/cert-tests/provable-privkey-rsa2048 @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE=provable-privkey$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/reject-invalid-time b/tests/cert-tests/reject-invalid-time index 39aa5c4ca5..27b3f3c758 100755 --- a/tests/cert-tests/reject-invalid-time +++ b/tests/cert-tests/reject-invalid-time @@ -19,10 +19,10 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -PKGCONFIG="${PKG_CONFIG:-$(which pkg-config)}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${PKG_CONFIG=pkg-config} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 @@ -32,9 +32,9 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" fi -${PKGCONFIG} --version >/dev/null || exit 77 +${PKG_CONFIG} --version >/dev/null || exit 77 -${PKGCONFIG} --atleast-version=4.12 libtasn1 || exit 77 +${PKG_CONFIG} --atleast-version=4.12 libtasn1 || exit 77 # Check whether certificates with invalid time fields are accepted for file in openssl-invalid-time-format.pem;do diff --git a/tests/cert-tests/rsa-pss-pad b/tests/cert-tests/rsa-pss-pad index 2c87c750fc..76b5a50742 100755 --- a/tests/cert-tests/rsa-pss-pad +++ b/tests/cert-tests/rsa-pss-pad @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} TMPFILE=pss.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/sha2-dsa-test b/tests/cert-tests/sha2-dsa-test index 8632aefd31..f24195ce12 100755 --- a/tests/cert-tests/sha2-dsa-test +++ b/tests/cert-tests/sha2-dsa-test @@ -22,8 +22,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TEMPLFILE=template-dsa.$$.tmp CAFILE=ca-dsa.$$.tmp SUBCAFILE=subca-dsa.$$.tmp diff --git a/tests/cert-tests/sha2-test b/tests/cert-tests/sha2-test index eca12fdf7c..0c5ebd4cbc 100755 --- a/tests/cert-tests/sha2-test +++ b/tests/cert-tests/sha2-test @@ -22,8 +22,8 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} TEMPLFILE=template.$$.tmp CAFILE=ca.$$.tmp SUBCAFILE=subca.$$.tmp diff --git a/tests/cert-tests/sha3-test b/tests/cert-tests/sha3-test index a4300672c3..386b20b63d 100755 --- a/tests/cert-tests/sha3-test +++ b/tests/cert-tests/sha3-test @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} TMPFILE=sha3.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/smime b/tests/cert-tests/smime index f5e68401cf..5f6f8038e8 100755 --- a/tests/cert-tests/smime +++ b/tests/cert-tests/smime @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/template-exts-test b/tests/cert-tests/template-exts-test index 276ba2f798..379a9290e5 100755 --- a/tests/cert-tests/template-exts-test +++ b/tests/cert-tests/template-exts-test @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} OUTFILE="exts.$$.tmp" if ! test -x "${CERTTOOL}"; then diff --git a/tests/cert-tests/template-test b/tests/cert-tests/template-test index 091021315b..b17942f2f8 100755 --- a/tests/cert-tests/template-test +++ b/tests/cert-tests/template-test @@ -20,10 +20,10 @@ #set -e -srcdir="${srcdir:-.}" -ac_cv_sizeof_time_t="${ac_cv_sizeof_time_t:-8}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${ac_cv_sizeof_time_t=8} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/tlsfeature-test b/tests/cert-tests/tlsfeature-test index fb26f6225b..4148a7b97c 100755 --- a/tests/cert-tests/tlsfeature-test +++ b/tests/cert-tests/tlsfeature-test @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${DIFF=diff} TMPFILE=tlsfeature.$$.tmp TMPFILE2=tlsfeature-2.$$.tmp diff --git a/tests/cert-tests/tolerate-invalid-time b/tests/cert-tests/tolerate-invalid-time index 22d2a9199b..d5f89163f3 100755 --- a/tests/cert-tests/tolerate-invalid-time +++ b/tests/cert-tests/tolerate-invalid-time @@ -19,10 +19,10 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" -PKGCONFIG="${PKG_CONFIG:-$(which pkg-config)}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} +: ${PKG_CONFIG=pkg-config} +: ${DIFF=diff -b -B} if ! test -x "${CERTTOOL}"; then exit 77 @@ -32,9 +32,9 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" fi -${PKGCONFIG} --version >/dev/null || exit 77 +${PKG_CONFIG} --version >/dev/null || exit 77 -${PKGCONFIG} --atleast-version=4.12 libtasn1 || exit 77 +${PKG_CONFIG} --atleast-version=4.12 libtasn1 || exit 77 # Check whether certificates with invalid time fields are accepted for file in openssl-invalid-time-format.pem;do diff --git a/tests/cert-tests/userid b/tests/cert-tests/userid index e3cdef1efa..39753c2753 100755 --- a/tests/cert-tests/userid +++ b/tests/cert-tests/userid @@ -20,8 +20,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/cert-tests/x509-duplicate-ext b/tests/cert-tests/x509-duplicate-ext index 534a534a69..0cfa7e1673 100755 --- a/tests/cert-tests/x509-duplicate-ext +++ b/tests/cert-tests/x509-duplicate-ext @@ -17,8 +17,8 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} OUTFILE=out.$$.tmp if ! test -x "${CERTTOOL}"; then diff --git a/tests/certtool-pkcs11.sh b/tests/certtool-pkcs11.sh index daba535a4d..0964da536b 100755 --- a/tests/certtool-pkcs11.sh +++ b/tests/certtool-pkcs11.sh @@ -18,12 +18,12 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -P11TOOL="${P11TOOL:-../src/p11tool${EXEEXT}}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${P11TOOL=../src/p11tool${EXEEXT}} +: ${CERTTOOL=../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} RETCODE=0 if ! test -x "${P11TOOL}"; then diff --git a/tests/cipher-listings.sh b/tests/cipher-listings.sh index f11b01babb..768f5cfe63 100755 --- a/tests/cipher-listings.sh +++ b/tests/cipher-listings.sh @@ -20,10 +20,10 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" -SED="${SED:-sed}" +: ${srcdir=.} +: ${CLI=../src/gnutls-cli${EXEEXT}} +: ${DIFF=diff -b -B} +: ${SED=sed} unset RETCODE TMPFILE=cipher-listings.$$.tmp diff --git a/tests/danetool.sh b/tests/danetool.sh index be4445d93e..77ab0305c2 100755 --- a/tests/danetool.sh +++ b/tests/danetool.sh @@ -18,8 +18,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -DANETOOL="${DANETOOL:-../src/danetool${EXEEXT}}" +: ${srcdir=.} +: ${DANETOOL=../src/danetool${EXEEXT}} if test "${WINDIR}" != ""; then exit 77 diff --git a/tests/dh-fips-approved.sh b/tests/dh-fips-approved.sh index 136dd15f32..687ad6d5f7 100755 --- a/tests/dh-fips-approved.sh +++ b/tests/dh-fips-approved.sh @@ -19,9 +19,9 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${SERV}"; then diff --git a/tests/fastopen.sh b/tests/fastopen.sh index 87f3b24bba..95cbff267b 100755 --- a/tests/fastopen.sh +++ b/tests/fastopen.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${SERV}"; then diff --git a/tests/gnutls-cli-debug.sh b/tests/gnutls-cli-debug.sh index 2a1738cc6e..ab81275972 100755 --- a/tests/gnutls-cli-debug.sh +++ b/tests/gnutls-cli-debug.sh @@ -20,9 +20,9 @@ # along with this program. If not, see <https://www.gnu.org/licenses/> # -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -DCLI="${DCLI:-../src/gnutls-cli-debug${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${DCLI=../src/gnutls-cli-debug${EXEEXT}} OUTFILE=cli-debug.$$.tmp TMPFILE=config.$$.tmp unset RETCODE diff --git a/tests/gnutls-cli-invalid-crl.sh b/tests/gnutls-cli-invalid-crl.sh index 1a82bfafd3..8f1ea8ae75 100755 --- a/tests/gnutls-cli-invalid-crl.sh +++ b/tests/gnutls-cli-invalid-crl.sh @@ -19,9 +19,9 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE TMPFILE=crl-inv.$$.pem.tmp CAFILE=crl-inv-ca.$$.pem.tmp diff --git a/tests/gnutls-cli-rawpk.sh b/tests/gnutls-cli-rawpk.sh index 8b60da780e..56f30c68aa 100755 --- a/tests/gnutls-cli-rawpk.sh +++ b/tests/gnutls-cli-rawpk.sh @@ -20,9 +20,9 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE CERTFILE1=rawpk-script1.$$.pem.tmp CERTFILE2=rawpk-script2.$$.pem.tmp diff --git a/tests/gnutls-cli-resume.sh b/tests/gnutls-cli-resume.sh index 38ac076efa..e46eb45507 100755 --- a/tests/gnutls-cli-resume.sh +++ b/tests/gnutls-cli-resume.sh @@ -20,9 +20,9 @@ # along with this program. If not, see <https://www.gnu.org/licenses/> # -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${SERV}"; then diff --git a/tests/gnutls-cli-save-data.sh b/tests/gnutls-cli-save-data.sh index 29a2c081b6..d9df2b6d6a 100755 --- a/tests/gnutls-cli-save-data.sh +++ b/tests/gnutls-cli-save-data.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${SERV}"; then diff --git a/tests/gnutls-cli-self-signed.sh b/tests/gnutls-cli-self-signed.sh index fbb5375bf0..d68b64d80c 100755 --- a/tests/gnutls-cli-self-signed.sh +++ b/tests/gnutls-cli-self-signed.sh @@ -19,9 +19,9 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE TMPFILE=self-signed.$$.pem.tmp diff --git a/tests/logfile-option.sh b/tests/logfile-option.sh index 8cd8f9b53f..869d22c837 100755 --- a/tests/logfile-option.sh +++ b/tests/logfile-option.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${SERV}"; then diff --git a/tests/long-crl.sh b/tests/long-crl.sh index 3abd910cbd..b59c8cb74c 100755 --- a/tests/long-crl.sh +++ b/tests/long-crl.sh @@ -20,8 +20,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/nist-pkits/pkits b/tests/nist-pkits/pkits index ac7221244e..0bdd337223 100755 --- a/tests/nist-pkits/pkits +++ b/tests/nist-pkits/pkits @@ -20,7 +20,7 @@ set -e -srcdir="${srcdir:-.}" +: ${srcdir=.} echo "Running PKITS CRT..." "${srcdir}/pkits_crt" diff --git a/tests/nist-pkits/pkits_crl b/tests/nist-pkits/pkits_crl index 6c3e92d606..58e630d76c 100755 --- a/tests/nist-pkits/pkits_crl +++ b/tests/nist-pkits/pkits_crl @@ -18,8 +18,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool} test -d crls || unzip "${srcdir}/PKITS_data.zip" diff --git a/tests/nist-pkits/pkits_crt b/tests/nist-pkits/pkits_crt index 92b69bd855..630acdb688 100755 --- a/tests/nist-pkits/pkits_crt +++ b/tests/nist-pkits/pkits_crt @@ -18,8 +18,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool} test -d certs || unzip "${srcdir}/PKITS_data.zip" diff --git a/tests/nist-pkits/pkits_pkcs12 b/tests/nist-pkits/pkits_pkcs12 index 0b34cb9a6f..fd4b6860f2 100755 --- a/tests/nist-pkits/pkits_pkcs12 +++ b/tests/nist-pkits/pkits_pkcs12 @@ -18,8 +18,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool} test -d pkcs12 || unzip "${srcdir}/PKITS_data.zip" diff --git a/tests/nist-pkits/pkits_smime b/tests/nist-pkits/pkits_smime index 62da9c95b4..c0b74b93dd 100755 --- a/tests/nist-pkits/pkits_smime +++ b/tests/nist-pkits/pkits_smime @@ -18,8 +18,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -srcdir="${srcdir:-.}" -CERTTOOL=${CERTTOOL:-../../src/certtool} +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool} test -d smime || unzip "${srcdir}/PKITS_data.zip" diff --git a/tests/nist-pkits/pkits_test b/tests/nist-pkits/pkits_test index 49feecb951..adf999c9c9 100755 --- a/tests/nist-pkits/pkits_test +++ b/tests/nist-pkits/pkits_test @@ -2,7 +2,7 @@ set -e -srcdir="${srcdir:-.}" +: ${srcdir=.} test -d certs || unzip "${srcdir}/PKITS_data.zip" diff --git a/tests/ocsp-tests/ocsp-load-chain b/tests/ocsp-tests/ocsp-load-chain index 0822bc3d99..33cc020fcb 100755 --- a/tests/ocsp-tests/ocsp-load-chain +++ b/tests/ocsp-tests/ocsp-load-chain @@ -19,9 +19,9 @@ #set -e -srcdir="${srcdir:-.}" -OCSPTOOL="${OCSPTOOL:-../src/ocsptool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${OCSPTOOL=../src/ocsptool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${OCSPTOOL}"; then exit 77 diff --git a/tests/ocsp-tests/ocsp-must-staple-connection b/tests/ocsp-tests/ocsp-must-staple-connection index 7da31765ed..ebf54165c6 100755 --- a/tests/ocsp-tests/ocsp-must-staple-connection +++ b/tests/ocsp-tests/ocsp-must-staple-connection @@ -18,13 +18,13 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" -OCSPTOOL="${OCSPTOOL:-../src/ocsptool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../src/certtool${EXEEXT}} +: ${OCSPTOOL=../src/ocsptool${EXEEXT}} GNUTLS_SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" unset SERV -GNUTLS_CLI="${GNUTLS_CLI:-../src/gnutls-cli${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${GNUTLS_CLI=../src/gnutls-cli${EXEEXT}} +: ${DIFF=diff} TEMPLATE_FILE="ms-out.$$.tmpl.tmp" SERVER_CERT_FILE="ms-cert.$$.pem.tmp" SERVER_CERT_NO_EXT_FILE="ms-cert-no-ext.$$.pem.tmp" diff --git a/tests/ocsp-tests/ocsp-test b/tests/ocsp-tests/ocsp-test index bc2641a22e..cfb3033978 100755 --- a/tests/ocsp-tests/ocsp-test +++ b/tests/ocsp-tests/ocsp-test @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -OCSPTOOL="${OCSPTOOL:-../src/ocsptool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${OCSPTOOL=../src/ocsptool${EXEEXT}} +: ${DIFF=diff} if ! test -x "${OCSPTOOL}"; then exit 77 diff --git a/tests/ocsp-tests/ocsp-tls-connection b/tests/ocsp-tests/ocsp-tls-connection index fba9a6eb1c..8d5b176bc7 100755 --- a/tests/ocsp-tests/ocsp-tls-connection +++ b/tests/ocsp-tests/ocsp-tls-connection @@ -21,13 +21,13 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" -OCSPTOOL="${OCSPTOOL:-../src/ocsptool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../src/certtool${EXEEXT}} +: ${OCSPTOOL=../src/ocsptool${EXEEXT}} GNUTLS_SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" unset SERV -GNUTLS_CLI="${GNUTLS_CLI:-../src/gnutls-cli${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${GNUTLS_CLI=../src/gnutls-cli${EXEEXT}} +: ${DIFF=diff} TEMPLATE_FILE="out.$$.tmpl.tmp" SERVER_CERT_FILE="cert.$$.pem.tmp" diff --git a/tests/ocsp-tests/ocsptool b/tests/ocsp-tests/ocsptool index 6677f80588..b10013ed32 100755 --- a/tests/ocsp-tests/ocsptool +++ b/tests/ocsp-tests/ocsptool @@ -21,10 +21,10 @@ # Sanity check program for various ocsptool options -srcdir="${srcdir:-.}" -OCSPTOOL="${OCSPTOOL:-../src/ocsptool${EXEEXT}}" -DIFF="${DIFF:-diff}" -CMP="${CMP:-cmp}" +: ${srcdir=.} +: ${OCSPTOOL=../src/ocsptool${EXEEXT}} +: ${DIFF=diff} +: ${CMP=cmp} TMPFILE=ocsp.$$.tmp if ! test -x "${OCSPTOOL}"; then diff --git a/tests/p11-kit-load.sh b/tests/p11-kit-load.sh index 419900f6a3..36629241da 100755 --- a/tests/p11-kit-load.sh +++ b/tests/p11-kit-load.sh @@ -19,12 +19,12 @@ #set -e -srcdir="${srcdir:-.}" -builddir="${builddir:-.}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" -P11TOOL="${P11TOOL:-../src/p11tool${EXEEXT}}" -DIFF="${DIFF:-diff}" -PKGCONFIG="${PKG_CONFIG:-$(which pkg-config)}" +: ${srcdir=.} +: ${builddir=.} +: ${CERTTOOL=../src/certtool${EXEEXT}} +: ${P11TOOL=../src/p11tool${EXEEXT}} +: ${DIFF=diff} +: ${PKG_CONFIG=pkg-config} TMP_SOFTHSM_DIR="./softhsm-load.$$.tmp" P11DIR="p11-kit-conf.$$.tmp" PIN=1234 @@ -46,9 +46,9 @@ for lib in ${libdir} ${libdir}/pkcs11 /usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/l fi done -${PKGCONFIG} --version >/dev/null || exit 77 +${PKG_CONFIG} --version >/dev/null || exit 77 -${PKGCONFIG} --atleast-version=0.23.10 p11-kit-1 +${PKG_CONFIG} --atleast-version=0.23.10 p11-kit-1 if test $? != 0;then echo p11-kit 0.23.10 is required exit 77 diff --git a/tests/p11-kit-trust.sh b/tests/p11-kit-trust.sh index 0af8272310..b47004accb 100755 --- a/tests/p11-kit-trust.sh +++ b/tests/p11-kit-trust.sh @@ -20,10 +20,10 @@ #set -e -srcdir="${srcdir:-.}" -P11TOOL="${P11TOOL:-../src/p11tool${EXEEXT}}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff}" +: ${srcdir=.} +: ${P11TOOL=../src/p11tool${EXEEXT}} +: ${CERTTOOL=../src/certtool${EXEEXT}} +: ${DIFF=diff} EXPORTED_FILE=out.$$.tmp DER_FILE=out-der.$$.tmp diff --git a/tests/pkcs7-cat.sh b/tests/pkcs7-cat.sh index a7a53a431a..86b1c6a1da 100755 --- a/tests/pkcs7-cat.sh +++ b/tests/pkcs7-cat.sh @@ -20,9 +20,9 @@ #set -e -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" +: ${srcdir=.} +: ${CERTTOOL=../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=15" fi diff --git a/tests/pkgconfig.sh b/tests/pkgconfig.sh index e1034162ae..b06ffa5a8c 100755 --- a/tests/pkgconfig.sh +++ b/tests/pkgconfig.sh @@ -20,19 +20,19 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -top_builddir="${top_builddir:-..}" -PKGCONFIG="${PKG_CONFIG:-$(which pkg-config)}" -CC=${CC:-cc} +: ${srcdir=.} +: ${top_builddir=..} +: ${PKG_CONFIG=pkg-config} +: ${CC=cc} unset RETCODE TMPFILE=c.$$.tmp.c TMPFILE_O=c.$$.tmp.o echo "$CFLAGS"|grep sanitize && exit 77 -${PKGCONFIG} --version >/dev/null || exit 77 +${PKG_CONFIG} --version >/dev/null || exit 77 -${PKGCONFIG} --libs nettle +${PKG_CONFIG} --libs nettle if test $? != 0;then echo "Nettle was not found in pkg-config" exit 77 @@ -40,7 +40,7 @@ fi for lib in libidn2 p11-kit-1 do - OTHER=$(${PKGCONFIG} --libs --static $lib) + OTHER=$(${PKG_CONFIG} --libs --static $lib) if test -n "${OTHER}" && test "${OTHER#*-R}" != "$OTHER";then echo "Found invalid string in $lib flags: ${OTHER}" exit 77 @@ -68,16 +68,16 @@ __EOF__ COMMON="-I${top_builddir}/lib/includes -L${top_builddir}/lib/.libs -I${srcdir}/../lib/includes" echo "Trying dynamic linking with:" -echo " * flags: $(${PKGCONFIG} --libs gnutls)" +echo " * flags: $(${PKG_CONFIG} --libs gnutls)" echo " * common: ${COMMON}" echo " * lib: ${CFLAGS}" -echo cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} -${CC} ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} +echo cc ${TMPFILE} -o ${TMPFILE_O} $(${PKG_CONFIG} --libs gnutls) $(${PKG_CONFIG} --cflags gnutls) ${COMMON} +${CC} ${TMPFILE} -o ${TMPFILE_O} $(${PKG_CONFIG} --libs gnutls) $(${PKG_CONFIG} --cflags gnutls) ${COMMON} echo "" -echo "Trying static linking with $(${PKGCONFIG} --libs --static gnutls)" -echo cc ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} -${CC} ${TMPFILE} -o ${TMPFILE_O} $(${PKGCONFIG} --static --libs gnutls) $(${PKGCONFIG} --cflags gnutls) ${COMMON} +echo "Trying static linking with $(${PKG_CONFIG} --libs --static gnutls)" +echo cc ${TMPFILE} -o ${TMPFILE_O} $(${PKG_CONFIG} --static --libs gnutls) $(${PKG_CONFIG} --cflags gnutls) ${COMMON} +${CC} ${TMPFILE} -o ${TMPFILE_O} $(${PKG_CONFIG} --static --libs gnutls) $(${PKG_CONFIG} --cflags gnutls) ${COMMON} rm -f ${TMPFILE} ${TMPFILE_O} diff --git a/tests/profile-tests.sh b/tests/profile-tests.sh index 71295fd5a6..3c50a1628a 100755 --- a/tests/profile-tests.sh +++ b/tests/profile-tests.sh @@ -22,9 +22,9 @@ # This program tests whether the profile keywords work as expected -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} TMPFILE=config.$$.tmp export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 diff --git a/tests/psktool.sh b/tests/psktool.sh index a5302f57aa..9e81d01718 100755 --- a/tests/psktool.sh +++ b/tests/psktool.sh @@ -19,8 +19,8 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -PSKTOOL="${PSKTOOL:-../src/psktool${EXEEXT}}" +: ${srcdir=.} +: ${PSKTOOL=../src/psktool${EXEEXT}} TMPFILE=psktool.$$.tmp if ! test -x "${PSKTOOL}"; then diff --git a/tests/rfc2253-escape-test b/tests/rfc2253-escape-test index 71a42504f4..2d71b83d00 100755 --- a/tests/rfc2253-escape-test +++ b/tests/rfc2253-escape-test @@ -22,7 +22,7 @@ set -e -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" +: ${CERTTOOL=../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/rsa-md5-collision/rsa-md5-collision.sh b/tests/rsa-md5-collision/rsa-md5-collision.sh index e319544b73..85f8e82675 100755 --- a/tests/rsa-md5-collision/rsa-md5-collision.sh +++ b/tests/rsa-md5-collision/rsa-md5-collision.sh @@ -21,8 +21,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../src/certtool${EXEEXT}} TMPFILE1=rsa-md5.$$.tmp TMPFILE2=rsa-md5-2.$$.tmp diff --git a/tests/serv-udp.sh b/tests/serv-udp.sh index 9db3a32a42..b66db19cd8 100755 --- a/tests/serv-udp.sh +++ b/tests/serv-udp.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${SERV}"; then diff --git a/tests/server-multi-keys.sh b/tests/server-multi-keys.sh index 7737ec9b83..cf34f514d1 100755 --- a/tests/server-multi-keys.sh +++ b/tests/server-multi-keys.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${SERV}"; then diff --git a/tests/server-weak-keys.sh b/tests/server-weak-keys.sh index 1fa14711fb..a1135b4560 100755 --- a/tests/server-weak-keys.sh +++ b/tests/server-weak-keys.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${SERV}"; then diff --git a/tests/slow/test-ciphers-api.sh b/tests/slow/test-ciphers-api.sh index d591496be1..814f5cc024 100755 --- a/tests/slow/test-ciphers-api.sh +++ b/tests/slow/test-ciphers-api.sh @@ -19,7 +19,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" +: ${srcdir=.} PROG=./cipher-api-test${EXEEXT} . "${srcdir}/test-ciphers-common.sh" diff --git a/tests/slow/test-ciphers-common.sh b/tests/slow/test-ciphers-common.sh index 1a76b48ce0..b1a238671a 100644 --- a/tests/slow/test-ciphers-common.sh +++ b/tests/slow/test-ciphers-common.sh @@ -23,7 +23,7 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" fi -srcdir="${srcdir:-.}" +: ${srcdir=.} . "${srcdir}/../scripts/common.sh" ${PROG} diff --git a/tests/slow/test-ciphers-openssl.sh b/tests/slow/test-ciphers-openssl.sh index b025fcc600..dc8fb60edc 100755 --- a/tests/slow/test-ciphers-openssl.sh +++ b/tests/slow/test-ciphers-openssl.sh @@ -20,7 +20,7 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} PROG=./cipher-openssl-compat${EXEEXT} . "${srcdir}/test-ciphers-common.sh" diff --git a/tests/slow/test-ciphers.sh b/tests/slow/test-ciphers.sh index abc020be6b..b4bc41151a 100755 --- a/tests/slow/test-ciphers.sh +++ b/tests/slow/test-ciphers.sh @@ -20,7 +20,7 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} PROG=./cipher-test${EXEEXT} . "${srcdir}/test-ciphers-common.sh" diff --git a/tests/slow/test-hash-large.sh b/tests/slow/test-hash-large.sh index 754232ec2c..359a15ff72 100755 --- a/tests/slow/test-hash-large.sh +++ b/tests/slow/test-hash-large.sh @@ -27,7 +27,7 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" fi -srcdir="${srcdir:-.}" +: ${srcdir=.} . "${srcdir}/../scripts/common.sh" run_test() { diff --git a/tests/sni-hostname.sh b/tests/sni-hostname.sh index 8bcc3b9a8a..ae72f10670 100755 --- a/tests/sni-hostname.sh +++ b/tests/sni-hostname.sh @@ -19,9 +19,9 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${SERV}"; then diff --git a/tests/sni-resume.sh b/tests/sni-resume.sh index 913f4a8b79..717199c7e5 100755 --- a/tests/sni-resume.sh +++ b/tests/sni-resume.sh @@ -19,9 +19,9 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${SERV}"; then diff --git a/tests/starttls-ftp.sh b/tests/starttls-ftp.sh index 4e6b241e3a..9baad57941 100755 --- a/tests/starttls-ftp.sh +++ b/tests/starttls-ftp.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE . "${srcdir}/scripts/common.sh" diff --git a/tests/starttls-lmtp.sh b/tests/starttls-lmtp.sh index 96c5c0c160..a1b6d6b13c 100755 --- a/tests/starttls-lmtp.sh +++ b/tests/starttls-lmtp.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE . "${srcdir}/scripts/common.sh" diff --git a/tests/starttls-nntp.sh b/tests/starttls-nntp.sh index 256a7cad4b..6cd834dcae 100755 --- a/tests/starttls-nntp.sh +++ b/tests/starttls-nntp.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE . "${srcdir}/scripts/common.sh" diff --git a/tests/starttls-pop3.sh b/tests/starttls-pop3.sh index 57fa2de9af..37e5263897 100755 --- a/tests/starttls-pop3.sh +++ b/tests/starttls-pop3.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE . "${srcdir}/scripts/common.sh" diff --git a/tests/starttls-sieve.sh b/tests/starttls-sieve.sh index e7b90a3e06..dc395ba9af 100755 --- a/tests/starttls-sieve.sh +++ b/tests/starttls-sieve.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE . "${srcdir}/scripts/common.sh" diff --git a/tests/starttls-smtp.sh b/tests/starttls-smtp.sh index c346b11f17..6633e1ce13 100755 --- a/tests/starttls-smtp.sh +++ b/tests/starttls-smtp.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE . "${srcdir}/scripts/common.sh" diff --git a/tests/starttls-xmpp.sh b/tests/starttls-xmpp.sh index 71fc512572..82d0db7751 100755 --- a/tests/starttls-xmpp.sh +++ b/tests/starttls-xmpp.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE . "${srcdir}/scripts/common.sh" diff --git a/tests/starttls.sh b/tests/starttls.sh index 0feed953ac..77016687fa 100755 --- a/tests/starttls.sh +++ b/tests/starttls.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} unset RETCODE . "${srcdir}/scripts/common.sh" diff --git a/tests/suite/certs/create-chain.sh b/tests/suite/certs/create-chain.sh index c616189e63..4a32c65ad5 100755 --- a/tests/suite/certs/create-chain.sh +++ b/tests/suite/certs/create-chain.sh @@ -1,6 +1,6 @@ #!/bin/sh -CERTTOOL="${CERTTOOL:-../../../src/certtool${EXEEXT}}" +: ${CERTTOOL=../../../src/certtool${EXEEXT}} OUTPUT=out TEMPLATE=tmpl diff --git a/tests/suite/chain.sh b/tests/suite/chain.sh index d9e04bead7..03eea2e8b2 100755 --- a/tests/suite/chain.sh +++ b/tests/suite/chain.sh @@ -20,11 +20,11 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} mkdir -p x509paths cd x509paths -CERTTOOL="${CERTTOOL:-../../../src/certtool${EXEEXT}}" +: ${CERTTOOL=../../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/suite/ciphersuite/scan-gnutls.sh b/tests/suite/ciphersuite/scan-gnutls.sh index 1a7b519530..e84f04057e 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=.} +: ${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/eagain.sh b/tests/suite/eagain.sh index d012ad8cde..d2a4365b1d 100755 --- a/tests/suite/eagain.sh +++ b/tests/suite/eagain.sh @@ -20,8 +20,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../../src/gnutls-serv${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../../src/gnutls-serv${EXEEXT}} if ! test -x "${SERV}"; then exit 77 diff --git a/tests/suite/multi-ticket-reception.sh b/tests/suite/multi-ticket-reception.sh index 6c0113e372..2e16008ae4 100755 --- a/tests/suite/multi-ticket-reception.sh +++ b/tests/suite/multi-ticket-reception.sh @@ -20,10 +20,10 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} TLSPY_SERV="${srcdir}/tls-fuzzer/tlslite-ng/scripts/tls.py" PYPATH="${srcdir}/tls-fuzzer/tlsfuzzer/" -CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}" +: ${CLI=../../src/gnutls-cli${EXEEXT}} unset RETCODE if test "${PYTHON}" = ":" ; then diff --git a/tests/suite/test-ciphersuite-names.sh b/tests/suite/test-ciphersuite-names.sh index a00fa482de..a5c66099d9 100755 --- a/tests/suite/test-ciphersuite-names.sh +++ b/tests/suite/test-ciphersuite-names.sh @@ -1,7 +1,7 @@ #!/bin/sh -srcdir="${srcdir:-.}" -top_builddir="${top_builddir:-../..}" +: ${srcdir=.} +: ${top_builddir=../..} nodejs --help >/dev/null 2>&1 if test $? = 0; then diff --git a/tests/suite/testcompat-main-openssl b/tests/suite/testcompat-main-openssl index ce87a4ba5e..09cca54a55 100755 --- a/tests/suite/testcompat-main-openssl +++ b/tests/suite/testcompat-main-openssl @@ -30,9 +30,9 @@ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY # WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -srcdir="${srcdir:-.}" +: ${srcdir=.} GNUTLS_SERV="${SERV:-../../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}" +: ${CLI=../../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${CLI}"; then @@ -49,7 +49,7 @@ fi . "${srcdir}/../scripts/common.sh" -PORT="${PORT:-${RPORT}}" +: ${PORT=${RPORT}} SERV=openssl OPENSSL_CLI="$SERV" diff --git a/tests/suite/testcompat-main-polarssl b/tests/suite/testcompat-main-polarssl index e945fd5025..a7650e4f42 100755 --- a/tests/suite/testcompat-main-polarssl +++ b/tests/suite/testcompat-main-polarssl @@ -30,8 +30,8 @@ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY # WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -srcdir="${srcdir:-.}" -CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${CLI=../../src/gnutls-cli${EXEEXT}} LOGFILE=polarssl.log unset RETCODE diff --git a/tests/suite/testcompat-oldgnutls.sh b/tests/suite/testcompat-oldgnutls.sh index 937bf57050..f2e405aa06 100755 --- a/tests/suite/testcompat-oldgnutls.sh +++ b/tests/suite/testcompat-oldgnutls.sh @@ -30,9 +30,9 @@ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY # WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -abs_top_srcdir="${abs_top_srcdir:-$(pwd)/../../}" -srcdir="${srcdir:-.}" -CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}" +: ${abs_top_srcdir=$(pwd)/../../} +: ${srcdir=.} +: ${CLI=../../src/gnutls-cli${EXEEXT}} TMPFILE=testcompat-oldgnutls.$$.tmp # This assumes a root directory in /usr/local/OLDGNUTLS containing the @@ -58,7 +58,7 @@ skip_if_no_datefudge . "${srcdir}/testcompat-common" -PORT="${PORT:-${RPORT}}" +: ${PORT=${RPORT}} SERV=/usr/local/OLDGNUTLS/usr/bin/gnutls-serv diff --git a/tests/suite/testcompat-openssl.sh b/tests/suite/testcompat-openssl.sh index b932a599c9..847eded621 100755 --- a/tests/suite/testcompat-openssl.sh +++ b/tests/suite/testcompat-openssl.sh @@ -30,7 +30,7 @@ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY # WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -srcdir="${srcdir:-.}" +: ${srcdir=.} if test "${GNUTLS_FORCE_FIPS_MODE}" = 1;then echo "Cannot run in FIPS140-2 mode" diff --git a/tests/suite/testcompat-polarssl.sh b/tests/suite/testcompat-polarssl.sh index 2197a94bf7..7a9f67c27c 100755 --- a/tests/suite/testcompat-polarssl.sh +++ b/tests/suite/testcompat-polarssl.sh @@ -30,7 +30,7 @@ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY # WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -srcdir="${srcdir:-.}" +: ${srcdir=.} export TZ="UTC" diff --git a/tests/suite/testcompat-tls13-openssl.sh b/tests/suite/testcompat-tls13-openssl.sh index 1090a47763..ef24469b54 100755 --- a/tests/suite/testcompat-tls13-openssl.sh +++ b/tests/suite/testcompat-tls13-openssl.sh @@ -30,10 +30,10 @@ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY # WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -abs_top_srcdir="${abs_top_srcdir:-$(pwd)/../../}" -srcdir="${srcdir:-.}" +: ${abs_top_srcdir=$(pwd)/../../} +: ${srcdir=.} GNUTLS_SERV="${SERV:-../../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}" +: ${CLI=../../src/gnutls-cli${EXEEXT}} unset RETCODE if ! test -x "${CLI}"; then @@ -54,7 +54,7 @@ skip_if_no_datefudge . "${srcdir}/testcompat-common" -PORT="${PORT:-${RPORT}}" +: ${PORT=${RPORT}} SERV=openssl OPENSSL_CLI="$SERV" diff --git a/tests/suite/testdane.sh b/tests/suite/testdane.sh index 6fb56d2f8c..fac0427f49 100755 --- a/tests/suite/testdane.sh +++ b/tests/suite/testdane.sh @@ -18,8 +18,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -DANETOOL="${DANETOOL:-../../src/danetool${EXEEXT}}" +: ${srcdir=.} +: ${DANETOOL=../../src/danetool${EXEEXT}} unset RETCODE if ! test -x "${DANETOOL}"; then diff --git a/tests/suite/testrandom.sh b/tests/suite/testrandom.sh index 1283e9e765..fffde850e8 100755 --- a/tests/suite/testrandom.sh +++ b/tests/suite/testrandom.sh @@ -20,8 +20,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../../src/certtool${EXEEXT}} if ! test -x "${CERTTOOL}"; then exit 77 diff --git a/tests/suite/testrng.sh b/tests/suite/testrng.sh index c45c9300eb..1c8b2bd48a 100755 --- a/tests/suite/testrng.sh +++ b/tests/suite/testrng.sh @@ -18,7 +18,7 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} if ! test -x "/usr/bin/dieharder"; then exit 77 diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-alpn.sh b/tests/suite/tls-fuzzer/tls-fuzzer-alpn.sh index 07ab0fa7f0..020dc454a5 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-alpn.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-alpn.sh @@ -18,7 +18,7 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} tls_fuzzer_prepare() { PRIORITY="NORMAL:%VERIFY_ALLOW_SIGN_WITH_SHA1:+ARCFOUR-128:+3DES-CBC:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1:-CURVE-SECP192R1:+VERS-SSL3.0" diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-cert.sh b/tests/suite/tls-fuzzer/tls-fuzzer-cert.sh index 054343fc28..bf8af74393 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-cert.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-cert.sh @@ -18,7 +18,7 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} tls_fuzzer_prepare() { PRIORITY="NORMAL:+ARCFOUR-128:%VERIFY_ALLOW_SIGN_WITH_SHA1:+3DES-CBC:+DHE-DSS:+SIGN-DSA-SHA256:+SIGN-DSA-SHA1:-CURVE-SECP192R1:+VERS-SSL3.0" diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-nocert-ssl3.sh b/tests/suite/tls-fuzzer/tls-fuzzer-nocert-ssl3.sh index 37efc16241..98371e7f36 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-nocert-ssl3.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-nocert-ssl3.sh @@ -18,7 +18,7 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} tls_fuzzer_prepare() { PRIORITY="NORMAL:%VERIFY_ALLOW_SIGN_WITH_SHA1:+ARCFOUR-128:+3DES-CBC:-VERS-ALL:+VERS-SSL3.0" diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh b/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh index f9268627a2..638594bc3b 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh @@ -18,7 +18,7 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} tls_fuzzer_prepare() { PRIORITY="NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:+AES-128-CCM:+AES-256-CCM:+AES-128-CCM-8" diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-nocert.sh b/tests/suite/tls-fuzzer/tls-fuzzer-nocert.sh index 5405fc936c..d068d6d0e6 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-nocert.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-nocert.sh @@ -18,7 +18,7 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} tls_fuzzer_prepare() { VERSIONS="-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:+VERS-SSL3.0" diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-nolimit-tls13.sh b/tests/suite/tls-fuzzer/tls-fuzzer-nolimit-tls13.sh index 4b0e0fa087..e1babe89d4 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-nolimit-tls13.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-nolimit-tls13.sh @@ -18,7 +18,7 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} tls_fuzzer_prepare() { PRIORITY="NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:%ALLOW_SMALL_RECORDS" diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-nolimit.sh b/tests/suite/tls-fuzzer/tls-fuzzer-nolimit.sh index df1ae6bcc2..a4793a1939 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-nolimit.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-nolimit.sh @@ -18,7 +18,7 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} tls_fuzzer_prepare() { VERSIONS="-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:+VERS-SSL3.0" diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-psk.sh b/tests/suite/tls-fuzzer/tls-fuzzer-psk.sh index aeefae9a5e..80a346ca19 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-psk.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-psk.sh @@ -18,7 +18,7 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" +: ${srcdir=.} tls_fuzzer_prepare() { PRIORITY="NORMAL:-VERS-ALL:+VERS-TLS1.3:+VERS-TLS1.2:+VERS-TLS1.1:-KX-ALL:+DHE-PSK:+ECDHE-PSK:+PSK" diff --git a/tests/system-override-curves.sh b/tests/system-override-curves.sh index 84d581bc8f..5e8cbcef25 100755 --- a/tests/system-override-curves.sh +++ b/tests/system-override-curves.sh @@ -19,9 +19,9 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} TMPFILE=config.$$.tmp TMPFILE2=log.$$.tmp export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 diff --git a/tests/system-override-default-priority-string.sh b/tests/system-override-default-priority-string.sh index b0c963bb9c..9af06ce0a7 100755 --- a/tests/system-override-default-priority-string.sh +++ b/tests/system-override-default-priority-string.sh @@ -19,12 +19,12 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} TMPFILE=config.$$.tmp TMPFILE2=log.$$.tmp -STOCK_PRIORITY="${GNUTLS_SYSTEM_PRIORITY_FILE:-./system.prio}" +STOCK_PRIORITY="${GNUTLS_SYSTEM_PRIORITY_FILE-./system.prio}" export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 if ! test -x "${SERV}"; then diff --git a/tests/system-override-invalid.sh b/tests/system-override-invalid.sh index 9bd1e91f93..8b8f673410 100755 --- a/tests/system-override-invalid.sh +++ b/tests/system-override-invalid.sh @@ -20,8 +20,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${CLI=../src/gnutls-cli${EXEEXT}} TMPFILE=c.$$.tmp export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 diff --git a/tests/system-override-kx.sh b/tests/system-override-kx.sh index cd318a1650..5c91703b41 100755 --- a/tests/system-override-kx.sh +++ b/tests/system-override-kx.sh @@ -19,9 +19,9 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/> -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} TMPFILE=config.$$.tmp TMPFILE2=log.$$.tmp export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 diff --git a/tests/system-override-profiles.sh b/tests/system-override-profiles.sh index 516ce57e71..86ae558378 100755 --- a/tests/system-override-profiles.sh +++ b/tests/system-override-profiles.sh @@ -20,9 +20,9 @@ # along with this program. If not, see <https://www.gnu.org/licenses/> # -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} TMPFILE=config.$$.tmp TMPFILE2=log.$$.tmp export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 diff --git a/tests/system-override-tls.sh b/tests/system-override-tls.sh index 54bc190dd9..9f8acc365d 100755 --- a/tests/system-override-tls.sh +++ b/tests/system-override-tls.sh @@ -20,9 +20,9 @@ # along with this program. If not, see <https://www.gnu.org/licenses/> # -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} TMPFILE=config.$$.tmp export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 diff --git a/tests/system-override-versions.sh b/tests/system-override-versions.sh index e5191e2aeb..a1701bfdd0 100755 --- a/tests/system-override-versions.sh +++ b/tests/system-override-versions.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} TMPFILE=config.$$.tmp TMPFILE2=log.$$.tmp export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 diff --git a/tests/systemkey.sh b/tests/systemkey.sh index 991d798696..4e559915da 100755 --- a/tests/systemkey.sh +++ b/tests/systemkey.sh @@ -20,8 +20,8 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -SYSTEMKEY="${SYSTEMKEY:-../src/systemkey${EXEEXT}}" +: ${srcdir=.} +: ${SYSTEMKEY=../src/systemkey${EXEEXT}} unset RETCODE . "${srcdir}/scripts/common.sh" diff --git a/tests/testpkcs11.sh b/tests/testpkcs11.sh index 9458af2381..dcbf17530e 100755 --- a/tests/testpkcs11.sh +++ b/tests/testpkcs11.sh @@ -18,12 +18,12 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -P11TOOL="${P11TOOL:-../src/p11tool${EXEEXT}}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" -DIFF="${DIFF:-diff -b -B}" -SERV="${SERV:-../src/gnutls-serv${EXEEXT}}" -CLI="${CLI:-../src/gnutls-cli${EXEEXT}}" +: ${srcdir=.} +: ${P11TOOL=../src/p11tool${EXEEXT}} +: ${CERTTOOL=../src/certtool${EXEEXT}} +: ${DIFF=diff -b -B} +: ${SERV=../src/gnutls-serv${EXEEXT}} +: ${CLI=../src/gnutls-cli${EXEEXT}} RETCODE=0 if test "${GNUTLS_FORCE_FIPS_MODE}" = 1;then diff --git a/tests/tls13/prf-early.sh b/tests/tls13/prf-early.sh index 7f62aba8d8..755ae35f9e 100755 --- a/tests/tls13/prf-early.sh +++ b/tests/tls13/prf-early.sh @@ -18,8 +18,8 @@ # along with this program. If not, see <https://www.gnu.org/licenses/> # -srcdir="${srcdir:-.}" -builddir="${builddir:-.}" +: ${srcdir=.} +: ${builddir=.} . "${srcdir}/scripts/common.sh" diff --git a/tests/tpmtool_test.sh b/tests/tpmtool_test.sh index c6e4bc42ef..eba502612a 100755 --- a/tests/tpmtool_test.sh +++ b/tests/tpmtool_test.sh @@ -20,9 +20,9 @@ # along with GnuTLS; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -srcdir="${srcdir:-.}" -CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" -TPMTOOL="${TPMTOOL:-../src/tpmtool${EXEEXT}}" +: ${srcdir=.} +: ${CERTTOOL=../src/certtool${EXEEXT}} +: ${TPMTOOL=../src/tpmtool${EXEEXT}} if [ "$(id -u)" -ne 0 ]; then echo "Need to be root to run this test." |