tests: use ": ${FOO=BAR}" syntax for default handling in shell scripts

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/fuzz/run-afl.sh b/fuzz/run-afl.sh
index 68f77f8ce17198be18598aa0d4cdb3a7b9141d5d..ee1283f6fb60aa90d069f17a9aa99407499d9379 100755 (executable)
--- 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 3469c42d222885cb5d06549f55c001f4c107cfe3..8b147fc823da7de8091009638d80e2bbfbfba594 100755 (executable)
--- 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 e8d39588e36b3bef262073b827a681feba51260a..b7bbe91c1cd968656502ac1bab991277667f3aa3 100755 (executable)
--- 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 a2261b3809e1dcf7007186d23abfa0abcf8d4bff..d72bfa41d6bf8508176e28a5bfcdeefdcb0e3f38 100755 (executable)
--- 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 f923b29fa43ff4816088548f28ceb53985b0b8b1..5734c3fe000f02c6b3132c6e521230b089f8cb95 100755 (executable)
--- 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 9c25c396de4fafdeac8d9462a83ea22231d9a52a..1c72a9c675e1d8d8ceef8a29febc7b2bb83c8ae5 100755 (executable)
--- 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 4bf0a0cf85393062db1f9f7c08e986278c771cc4..c2d63d966c7ce998782153e80d49a9f76ff7ee74 100755 (executable)
--- 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 6ee2a226e69e8e7d0d64b2a1bf4b150722f38308..3310250289f9a21e21dec00c8c26ab0e95742940 100755 (executable)
--- 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 0fd29beea9eed6ddf25aad7479cfcd5fed66ff60..4b194ac9ca03690b5576e2a960e818b55fabec81 100755 (executable)
--- 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 dadc92cbf7c847bf437d1ebf4c06ccc0b747f5d9..7480150ba16d6857da3132e8ed934db1ba804b35 100755 (executable)
--- 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 9811777b1f1470f734725d718905ad93d0234c9d..885efe243f9095edb7b90c09da5e7bf5d408a452 100755 (executable)
--- 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 7e078225077e96e9db804e8462debb6142b44f65..2fc027a95bfc372bea02605934979ee68f68c0db 100755 (executable)
--- 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 41e7a9740c89b2a43a1636def78a9a4a6ec2dc4d..9614bdf59a5c84d75279dce5f1bbe72179d5671c 100755 (executable)
--- 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 17e1a40d53e7e6f64019a237ab73839bde4b7545..7aa0cc965a0d459e865f5458828ae195b1626c49 100755 (executable)
--- 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 654bf34869c1b3a78a3d88d5340b6049cfc5477b..598351d41dc9015fea6cab7b82befa909047e0e6 100755 (executable)
--- 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 6bd5d94def6529b0d014c7e6b39dc268617d6e3b..478d1f0d0b7bd94c4a2a604c3b0236118d302e66 100755 (executable)
--- 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 a814c08e1285bbd05bfa795facc16d2125437760..b37b305f90c939457cc95a69a94fa6be0d5fc95e 100755 (executable)
--- 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 a4d738627e3e408652aec66acbffa4d8b0dba174..f63ee923fe0602d0a58249bae917e6b21cda7859 100755 (executable)
--- 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 f4f97d757bdc7b1b910099bc96d689a441a25f90..56ed5e58474c0fd3a5775eebab2d314661f762a6 100755 (executable)
--- 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 1d64dee27ec888eea614aa386d784ba48caa3a43..60b161f6d8908160bdeedbb2d5a3a2d5ffc500cf 100755 (executable)
--- 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 66a1f308179227ff93e0937997f80884cb9081c7..9398c73dcc927d01d27d1add62b81e7f717c92cd 100755 (executable)
--- 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 f8901c8c3e0a97887829f272e1e64c22d38747d7..ed3821e932c7716746b326c242c68c15f54d6906 100755 (executable)
--- 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 c593351b57effd3b2130b36e76d9a6a4e6145a34..431b88f06eb23180fb05c966676de842fe9368fb 100755 (executable)
--- 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 a00281028e5add731394a24ac1914398933bf481..1629fec881d80046b248c8d782a26ad94826f98a 100755 (executable)
--- 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 ff47988a6de79ec1271da1aec5b837b0a29945d7..c16c539814467c80db9433d936c7af21995c9140 100755 (executable)
--- 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 1b9a162779af770298ddbbcc05d419902162cb92..d0cb611bc9100ebc82efd4e89f7c5282b194934b 100755 (executable)
--- 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 ba5e1100f6aad7335ceea9515a9ec237b492fb8c..e27e4a85f735c6630c75277126023a23e6b66c38 100755 (executable)
--- 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 58134a4d090a06499e9e601240d87fa445918eaa..53ef76051b070252541775e83c62d45c2b76e48c 100755 (executable)
--- 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 2e59593a3fca2e64057b9c49f90a4a67dfe52950..9c88035e874522274fdf993aadb6369dc4da053d 100755 (executable)
--- 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 eeb94ee976e41ec3fe8f49a66d5825d74db14b82..975687fe7a1bec4bf4bf675e712075a8a57b9f5c 100755 (executable)
--- 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 a6e092cc90a6b0c65626d82ed878fa03a202121c..caa7d542d0c0ca5ef13433beadb6de938fb0b0d8 100755 (executable)
--- 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 15d6280b1c08117f709f8399f63c1242c27768fb..7438e091f5e49d0f6075959a704182929fd914de 100755 (executable)
--- 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 3b2370d49a7d84e0f372af1f6c9c8b85964a12f3..e0c1e7479dfad67efea136e54385a057edeff244 100755 (executable)
--- 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 00f93b22dde9283675f4e972a5331005ade17a79..40eb6c12bb7e2fd532554ffc2f53157ca375e8a7 100755 (executable)
--- 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 d532012295d31ed23bed4196952fbc208ec6880e..b5cd7d710786a9832b44f12591fed41b63a4432f 100755 (executable)
--- 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 267a1fc7f36a3eef24c5e89509b4f80c062716e8..dc9380c74b3cea7599b3118b7c8c9ecb98e0fd72 100755 (executable)
--- 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 c75ab9e09d05b2a50198122a4feab25f54ad8e95..c8f34e4144318280dea439c3c854c06fd39f8265 100755 (executable)
--- 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 f28230a7b2df8e249bfc8a97f1579e47d7c1e894..a04b043c8ec4625284ae62103c240078e9e21853 100755 (executable)
--- 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 0b9c482db7725832ad4802d583661ea20b54d582..2c6a2d9f2dd0f2f2ce09e559b46180d03ecadb61 100755 (executable)
--- 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 265c0df542fb06acba5c09e19d4e927b4b16e3fe..2f719f3044c13297bdc6fbb01a96a1e5d6e456f2 100755 (executable)
--- 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 f7c4bba52b04a0285db9fe75397cf4ee42a505bf..ab94479ba7ff4e5ca87916e295c67ea9edc3e7fe 100755 (executable)
--- 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 ace10ca1815621d45d42c42839c43e3c441fa341..168e7c51262b9944474cfbd24547e4957e3ace87 100755 (executable)
--- 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 5767e09646fc3a14fd6fbc5b98a2f2a9f49ce593..709ee5c07ff2294c24141a1130f58fb08385f303 100755 (executable)
--- 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 b9351a055a23dda986c9e4c94bf9d66c4e25d7c6..b51d0c5d154638b23eeec4fca45c7966adc08aef 100755 (executable)
--- 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 65433974316d37c4c9b5f75e40820872773ab3c5..1cec37f4de07ad9d0f1a75572108adfbc45286c3 100755 (executable)
--- 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 6964d26f099f9154a4fb9617fdf698ad9133d109..150c103443ca52406dca11d5828407617eb8ae1a 100755 (executable)
--- 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 7d1816a33ad1696ea356788ab4495d272d92fe98..94f89a5e93ad507fe0faab0b5924b794f1650e9b 100755 (executable)
--- 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 6f235c512b638501cf0814386a000463ff65634f..40179703bc19c76cad37391576dc658dfd91a335 100755 (executable)
--- 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 5ca04d8005757e93fcedbe602bc7316683bd6733..2cf168bea4e0ed38a8bd4c3944a478dfd9a54080 100755 (executable)
--- 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 d23aad94b4d3e9f81c7b00bc7dcb461708a23b95..8bad70193e5b65c11b19768a4c15df29af25727a 100755 (executable)
--- 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 2fb8696626a7a76eb14f8a80079691c87d31cb06..27c84bfaf3445b1de12b087c2120236e68e7e705 100755 (executable)
--- 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 7474078ff6231ab41f761b451634a3d46401ae3c..2d33ebfb50a14f577948cb043be7948f1781bbee 100755 (executable)
--- 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 325b47a581ecca1ca0b36e9a901ec9241dc28c83..6527d9d369ed2518d6b6dd0e646dc29f3c0e07a1 100755 (executable)
--- 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 a9e8beac21199e3169176134f8b3a275db314091..edf19bbeece1d1baf2bbd9febdf51f490d962866 100755 (executable)
--- 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 73bacae253a0250864189ad2b30a4f9eca838baa..575ca58497a6c198d8763a401e122bc448979928 100755 (executable)
--- 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 0676c0f5f0f10edf26d05dac8bb2b021b738f305..50d51ce4b7d14b891bd51f0b687fc96326073fa9 100755 (executable)
--- 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 43c2ed5aff59de13dc2ac7b049f0ab49713b3235..f6fa889814a66bd7886929b6e92d6306a1231e89 100755 (executable)
--- 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 51d4389eb7f087b2c89b4df14a08eef6455f91d1..0049c6d9494105cbdffb1f5f35e3aa8862217a67 100755 (executable)
--- 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 f805ab3576c105566e05c4f85ef7bc083a2fdcf4..f7eee5daf15ef504f429c5fb045b1399d186916a 100755 (executable)
--- 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 3edf3437d8a08982f4e8cfb0b55a0219239d0f71..6517a242a54830cac353e4986d00b3c7096bd994 100755 (executable)
--- 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 f846476e7e1cd2de4cc5a6389929c45e24b969ed..7f6b4090cfe0caeab1c57fdf4f3f16d32a9e60e7 100755 (executable)
--- 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 39aa5c4ca5bd37241ac28aa1378518c8ddfa1581..27b3f3c7582d46f76870f2530b8c6656768a283b 100755 (executable)
--- 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 2c87c750fc9d167c975d84ee94706261891dbb16..76b5a50742243c4ed68fee7577943df1fe731ff0 100755 (executable)
--- 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 8632aefd31964e732292d6739293d5fe4aa5e5f7..f24195ce12d192c4f035413d2a0f31182ce39392 100755 (executable)
--- 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 eca12fdf7c0d013e4d1afe63a6903b69bfd57656..0c5ebd4cbcfc07b5960948d19cdc65b96d89630d 100755 (executable)
--- 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 a4300672c3cc1ec02aa974c0ae18d3ca4034fcd7..386b20b63d3e191675d892b81d0f51fb5698279c 100755 (executable)
--- 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 f5e68401cf242cc22298e71ea9ee20ca5744cffe..5f6f8038e89445b516a9883a9d5b85c5172e0682 100755 (executable)
--- 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 276ba2f7982f494c01969a49e94759d8d6a29f10..379a9290e52987335c418c327b5acd50ac114f36 100755 (executable)
--- 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 091021315b05d42bfb807371df6f13160b3868a4..b17942f2f8ff459a12c2b5e3962a3a33ed83eba6 100755 (executable)
--- 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 fb26f6225bbafc11bc0b03077bb199267a96039a..4148a7b97cda248c2eb8f1766611e0907331896f 100755 (executable)
--- 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 22d2a9199b35730cf4f8c56f687ab1be07238f4e..d5f89163f3a1ee228399761acb00679690a3ab07 100755 (executable)
--- 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 e3cdef1efaaf2a61f64fe311ed4286386790fc51..39753c2753a97b043a56515c70734769ea1e7db5 100755 (executable)
--- 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 534a534a69af1622a03e7d1fcc0a73de4076a922..0cfa7e1673e1fb634ff84227e768df713c8125b8 100755 (executable)
--- 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 daba535a4da99f73717699dbfa9ae4af02400f9c..0964da536b4cb6f6db69c3ffe8ee833927e6d5c4 100755 (executable)
--- 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 f11b01babb1a7c4dc380ecd0ca73354a16a19ea8..768f5cfe6393a708457f2b09a315721d920bf424 100755 (executable)
--- 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 be4445d93ed8afb7ea8bd1b5956c56d48ab31eb3..77ab0305c2dc0ad2551b5f73e041c09593f89ce7 100755 (executable)
--- 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 136dd15f3219021620702d9d3044e89b513e4af3..687ad6d5f763906fa34c599bb365244288d3147e 100755 (executable)
--- 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 87f3b24bbadca493540a0079b3e151bab1550182..95cbff267bba5356e5863d56536eea02d9cb2fa6 100755 (executable)
--- 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 2a1738cc6ebbd235faeba283255031ed4d500197..ab812759723bfe6063cae3cdeb7f23ed8e05ac49 100755 (executable)
--- 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 1a82bfafd3db0dbc565d19e950959d3f6dd02f19..8f1ea8ae752da42f237a5f2bc9ca6c60d24e04f4 100755 (executable)
--- 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 8b60da780e9ff200f10a0c24752c4a6e4f3005cf..56f30c68aada8311a748b255fbd29f4710c495c1 100755 (executable)
--- 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 38ac076efaa875f1c4e9d4b960ef74cc085e08f9..e46eb455076bba09f9bd5cd661d531c7c08bef0a 100755 (executable)
--- 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 29a2c081b6b90870e42e7d099acf749ef233441f..d9df2b6d6ad793070e77aa4f7673ff1a38996b6b 100755 (executable)
--- 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 fbb5375bf0534af835a3d9e514795f6fe2fc31ae..d68b64d80cc56d52bc5ea025378f73bba4334e4a 100755 (executable)
--- 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 8cd8f9b53fc960ec5318ed1c582669b66c93e7ca..869d22c837188ab08ccbf727b74e832dee0a6399 100755 (executable)
--- 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 3abd910cbdad2bbe99256f46ff772a81946b52a5..b59c8cb74c340c90cb1bd1b0a9924b311409cf5f 100755 (executable)
--- 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 ac7221244e50875dccc579f8f9425f127ba1c27f..0bdd337223dd912aefe670c581108fa5bd65211f 100755 (executable)
--- 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 6c3e92d6066014a2a9b0b2cd18ae253cc72906a3..58e630d76cf86cb8263e6405a567c0610a7c2b9f 100755 (executable)
--- 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 92b69bd855409645277bf8d46f48a9a73d868eb1..630acdb6885a7e2fbd034522b412207a61a245db 100755 (executable)
--- 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 0b34cb9a6f3a85fb81b6a001fc7918322b1665ad..fd4b6860f2be2f8a5c7ba6147f9af0b564305d15 100755 (executable)
--- 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 62da9c95b4434d2338c15207d9d24cebb946c252..c0b74b93dd53d8f5a56062db492b22bbb1f68fa3 100755 (executable)
--- 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 49feecb95169f339391e2ce90598c49a73a21cf6..adf999c9c985f78a95e30e1a776e153d42cd9a4d 100755 (executable)
--- 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 0822bc3d99ffe2e385b029e4b7aeeca9f4c90fee..33cc020fcb1eb6976f8fd155951dedf8ed4fd0a2 100755 (executable)
--- 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 7da31765edba6e75d3bc2b4b497bd8b95a60dec1..ebf54165c6a7c52310abd3767ae623fc95c1e115 100755 (executable)
--- 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 bc2641a22e9582390cc496345be3973b4e273cec..cfb3033978e44339cb5d632d0daec16ff42b7233 100755 (executable)
--- 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 fba9a6eb1c60aaf025f872b04bc7ac93e1f763be..8d5b176bc75bb97c851d45c05ad170350990d4f1 100755 (executable)
--- 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 6677f8058872aa0935cece10fddff93999947bcc..b10013ed3249da51e8951a232302e166af4230a0 100755 (executable)
--- 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 419900f6a327bd98fca3222788a54a36aa5dc651..36629241da0590d7b2066af288b3ae9fc4f49574 100755 (executable)
--- 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 0af827231093fdc7827558c8917721af9adc9098..b47004accbdd5b127d50e11ba79e50d11922c300 100755 (executable)
--- 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 a7a53a431a00a689e72412cd79ecbed965d11ce4..86b1c6a1dab8820bba1cd30175b8750074876a40 100755 (executable)
--- 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 e1034162aeee5fa8e6e9815384673c013cdd6e5e..b06ffa5a8c3e40650532156aed22f327ad0fc3e9 100755 (executable)
--- 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 71295fd5a691e183961f0ddd1556415074b99285..3c50a1628aec83143b088d22e43646d84a2bccc3 100755 (executable)
--- 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 a5302f57aa810ef8f9b001a97710a86e43a826bf..9e81d0171849c1cb3060a4bd9a378beacecdb5f9 100755 (executable)
--- 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 71a42504f45f0ab09dd41289f54f8836403814ca..2d71b83d00bb363532115d01b387cca471957993 100755 (executable)
--- 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 e319544b7370a594eb8d013a2b6e366036aff035..85f8e826757aea53106c36fcad0769e5fb23a008 100755 (executable)
--- 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 9db3a32a429c6024216cc5ca18308d237897eed0..b66db19cd80ca93fb5231f6ce66e6e8d05951c78 100755 (executable)
--- 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 7737ec9b83ffcc3f819be0e1640b6e3d72991a76..cf34f514d13cf0d54241ed5de193a9d0bf5edc32 100755 (executable)
--- 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 1fa14711fb4928845045381e78c10d25321f21a3..a1135b4560c486374f385ff4160875fb5d2a7d5d 100755 (executable)
--- 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 d591496be1ce81d514403160ff88cac8fdbb0f3f..814f5cc024f6bf0f1215d73f801cbaf673543440 100755 (executable)
--- 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 1a76b48ce0eff02c720d10f989200e495650f0cc..b1a238671af8c8e0aabfdc533319c02c54a8fdb3 100644 (file)
--- 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 b025fcc600fa98ade2726863f378bd0a083ec3d4..dc8fb60edc68221e4c2e443dca9034a66b7ec9ab 100755 (executable)
--- 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 abc020be6b3a56032173e88857a4602ab24f441d..b4bc41151ae4bd579723ac24b926babdbd9727be 100755 (executable)
--- 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 754232ec2c5741d234ab9a4f4557ab55f95f4e76..359a15ff722a539ff427ba2cfa044ce7f5ffd6c8 100755 (executable)
--- 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 8bcc3b9a8a5f41a42ff7a2624f6a11b1146db145..ae72f10670e4e8c774187abcf86603f39f7c3602 100755 (executable)
--- 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 913f4a8b796fe3fc52265534f97b1aa491570597..717199c7e5d4c64de15384673da2554311d01f61 100755 (executable)
--- 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 4e6b241e3a099f35581c82774a34dba39c36ca29..9baad57941c69bf288c316baa859f90344bc900a 100755 (executable)
--- 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 96c5c0c160fc105c2f59c241e7de0150f3ffee56..a1b6d6b13cfe6007134311be08f7ca6946d471cf 100755 (executable)
--- 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 256a7cad4b85fc29bdf3bb2c5c3b156c4e2595c1..6cd834dcae225e298e317ace9f24117a452cbb04 100755 (executable)
--- 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 57fa2de9afefaaf3f73439a19ec4164285740342..37e52638970d12c917a106fe3e0851264a3a2b1a 100755 (executable)
--- 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 e7b90a3e068f774083c0a41ed7f4d18dab09f006..dc395ba9af31778b42065a9d615388cdca4b2d9b 100755 (executable)
--- 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 c346b11f17c4d9519c9ef9a1786359693325ba1d..6633e1ce13d5bdebf05a168696fe831bcd18a1d6 100755 (executable)
--- 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 71fc512572864f711389e1886ea69aafcf9dc282..82d0db7751b597153b8a2399d53afd690ee7d8fa 100755 (executable)
--- 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 0feed953ac51fc355bb0ccd9eb435477228f6930..77016687faa2d71342cf67664f22d397a976a546 100755 (executable)
--- 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 c616189e63454aa2b1428964dc7b67dee4f156b5..4a32c65ad5a014389a7a92c65c66ebd07e5ba37a 100755 (executable)
--- 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 d9e04bead7d64b29985d9d3e0b7c20a4088aa214..03eea2e8b2ddd68deabff7379eb3bf141ac78c29 100755 (executable)
--- 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 1a7b5195306c8e20298492c1679a992022cdf5a3..e84f04057e99b44fa741e36e42911e97d46e3f9d 100755 (executable)
--- a/tests/suite/ciphersuite/scan-gnutls.sh
+++ b/tests/suite/ciphersuite/scan-gnutls.sh
@@ -3,8 +3,8 @@
 
 echo 'var gnutls_ciphersuites = {'
 
-srcdir="${srcdir:-.}"
-top_builddir="${top_builddir:-../..}"
+: ${srcdir=.}
+: ${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 d012ad8cdedc547793e521e0913dad4638392d2b..d2a4365b1df5eee08f3018f8b130f77006171324 100755 (executable)
--- 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 6c0113e372d712c57d99a4414b0d15f9b2b251d8..2e16008ae4eb7880dceef4282a0a3ced0af772a1 100755 (executable)
--- 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 a00fa482de815717e11cfb45b1fe21724c2948b3..a5c66099d961c316ddbf4f01ca9a152363c3a2bf 100755 (executable)
--- 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 ce87a4ba5ebeb5cf4b8de4e55a9740989e6485da..09cca54a55b28cbf6a76b482a6c726779847c6f6 100755 (executable)
--- 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 e945fd5025d8167f1cec3c23735efd2030adb2ad..a7650e4f420d5bfcebf897e5f150b2252fef4597 100755 (executable)
--- 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 937bf57050c27c39e82b87f85fa3b4182c4b3b6a..f2e405aa066669b2df5bbc62cfbae35ab5d47482 100755 (executable)
--- 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 b932a599c9ba2191a049fd1b8acb7d38fdb4b11f..847eded62120cf3cd6fb410fc01daf4366f9dfe4 100755 (executable)
--- 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 2197a94bf762bec5897e8a04ae09d56870701624..7a9f67c27cdd360f371940d84dd39dfc8eccfddf 100755 (executable)
--- 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 1090a47763e2d3aa7cbd41b7a31b91015163cfb4..ef24469b546fc9b73d2f6b6f27edc05bcd8d19ec 100755 (executable)
--- 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 6fb56d2f8ce370ebef1a5f38d022bcce80e501b0..fac0427f49c1a3fcd5a9bdabf4ba00ba9acc974d 100755 (executable)
--- 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 1283e9e765c59cd9a7c7e9af180efa595acd65cc..fffde850e8783a9c51c672762048406606a3c3a4 100755 (executable)
--- 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 c45c9300ebabe54178f7dd3bb5e4669f0a6c0287..1c8b2bd48ac2f8ed87e2b713ee5ba77af000e2b7 100755 (executable)
--- 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 07ab0fa7f02b28f1f4e9346e07848dad16e4eeaf..020dc454a541e8ce1a3be1f8d36b912a85043e61 100755 (executable)
--- 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 054343fc280acb01886fc008152ed554c5cbd0d5..bf8af74393144e28aac61c53443daff52be97678 100755 (executable)
--- 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 37efc162417d520b628ad02aefc6e8b83ad8b84d..98371e7f360d4cffbc6544f01c785e90c441f7f1 100755 (executable)
--- 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 f9268627a2dd09e8a80dcaa41278bf70377e0818..638594bc3ba9d6921249a0f5bae7c9877cfaad1f 100755 (executable)
--- 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 5405fc936c4f86dd3c8a43948ba39f6b4f8c213e..d068d6d0e65d75f7c9585e624097293cbaec2363 100755 (executable)
--- 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 4b0e0fa0879e2b6e9726586f396c491bfbc4ab74..e1babe89d4ad42543dc01000a5d35071b0c78cc7 100755 (executable)
--- 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 df1ae6bcc24ee3c677ba41658b10510ff556a116..a4793a193909074ed5f86eaf61bd7e70688546b3 100755 (executable)
--- 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 aeefae9a5e9ea91ac0e1a0c3282e4a88d9b091d3..80a346ca19b3d099c1c87c463b4c009f800dcd82 100755 (executable)
--- 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 84d581bc8f86a10dc371da127c9be103b336cc9d..5e8cbcef25470188799f491e5750cd508678a3ab 100755 (executable)
--- 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 b0c963bb9ce0b7b0b1ea60ad7c2279e242484714..9af06ce0a7ff195252bc7d7d20359773755a2e28 100755 (executable)
--- 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 9bd1e91f937b31686f1e391e252a2dbb0b5d75ac..8b8f673410d4461f4fbe5937991ad76f84d5cc5a 100755 (executable)
--- 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 cd318a1650dcaa4e49d561952000a17609d23d1b..5c91703b4165bd706bfdb0f5f4b0177aae84aeb1 100755 (executable)
--- 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 516ce57e71f6826f8a7c603062170b296c9c4287..86ae5583780c24df1bbe116592d94a3c1a56fd3a 100755 (executable)
--- 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 54bc190dd9fcc9131c25821fb6cc4ada5c67975f..9f8acc365dcde1a1c1a330124491f00755752e20 100755 (executable)
--- 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 e5191e2aeb7925e81918f04a4073a6732f18eb97..a1701bfdd0aaffaa3ac81868391271f30fc3f26b 100755 (executable)
--- 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 991d798696ff4d30c81b38c61ce79e059cc97d1c..4e559915dae043cb8fa1a45e83b2379a08f37c36 100755 (executable)
--- 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 9458af2381274c147657c0751f81e9d43884b2fa..dcbf17530e02fe39b629336cd04e9a34c901c9a1 100755 (executable)
--- 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 7f62aba8d87748c283746a93de970345ae4dbca8..755ae35f9e19ea46b3b9e5cbfda80168b0c4e69f 100755 (executable)
--- 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 c6e4bc42efa96e8907558d0d9c2a5b7236bf56ce..eba502612a293eb11134a62ce749ff87e6778ab2 100755 (executable)
--- 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."