diff options
author | Tim Rühsen <tim.ruehsen@gmx.de> | 2018-11-16 12:34:01 +0100 |
---|---|---|
committer | Tim Rühsen <tim.ruehsen@gmx.de> | 2018-12-18 10:39:06 +0100 |
commit | 43414e270e9eed7399cc6ad718cd7ba7e4a4cc9d (patch) | |
tree | 9e8788fe72672364f7a9dc7d3ad9f0071168acf8 | |
parent | 9e383460fac94e38762659b9256a292d0abbee60 (diff) | |
download | gnutls-43414e270e9eed7399cc6ad718cd7ba7e4a4cc9d.tar.gz |
tests/long-crl.sh: Increase portability (fix for busybox)
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
-rwxr-xr-x | tests/long-crl.sh | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/tests/long-crl.sh b/tests/long-crl.sh index 74327e36c6..3abd910cbd 100755 --- a/tests/long-crl.sh +++ b/tests/long-crl.sh @@ -21,7 +21,6 @@ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. srcdir="${srcdir:-.}" -DIFF="${DIFF:-diff}" CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}" if ! test -x "${CERTTOOL}"; then @@ -32,24 +31,20 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" fi +. "${srcdir}/scripts/common.sh" + TMPFILE=long.$$.pem.tmp -rm -f $TMPFILE ${VALGRIND} "${CERTTOOL}" --crl-info --inder --infile "${srcdir}/data/long.crl" --outfile $TMPFILE -rc=$? - -# We're done. -if test "${rc}" != "0"; then +if test $? != 0; then echo "CRL decoding failed 1!" - exit ${rc} + exit 1 fi -${DIFF} -I ^warning "${srcdir}/data/long.pem" "$TMPFILE" || ${DIFF} -I ^warning --strip-trailing-cr "${srcdir}/data/long.pem" $TMPFILE -rc=$? - -if test "${rc}" != "0"; then +check_if_equal "${srcdir}/data/long.pem" $TMPFILE "^warning" +if test $? != 0; then echo "CRL decoding failed 2!" - exit ${rc} + exit 1 fi rm -f $TMPFILE |