From 2cffd2d20b6e1065cc44c71703698e2f2d5026d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Fri, 16 Nov 2018 13:28:26 +0100
Subject: tests/cert-tests/certtool-crl-decoding: Increase portability (fix for
 busybox)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
---
 tests/cert-tests/certtool-crl-decoding | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/cert-tests/certtool-crl-decoding b/tests/cert-tests/certtool-crl-decoding
index 36fb1ea46d..dadc92cbf7 100755
--- a/tests/cert-tests/certtool-crl-decoding
+++ b/tests/cert-tests/certtool-crl-decoding
@@ -24,7 +24,6 @@
 
 srcdir="${srcdir:-.}"
 CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}"
-DIFF="${DIFF:-diff -b -B}"
 OUTFILE="crl.$$.pem"
 
 if ! test -x "${CERTTOOL}"; then
@@ -35,21 +34,21 @@ if ! test -z "${VALGRIND}"; then
 	VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=3"
 fi
 
+. "${srcdir}/../scripts/common.sh"
+
 # crl-demo1.pem: version 2 CRL with a single extension
 # crl-demo2.pem: version 2 CRL with two extensions (one critical)
 # crl-demo3.pem: version 1 CRL with many revoked certificates
 
 for i in "crl-demo1.pem" "crl-demo2.pem" "crl-demo3.pem";do
 ${VALGRIND} "${CERTTOOL}" --crl-info --infile "${srcdir}/data/$i" >$OUTFILE
-rc=$?
-
-if test "${rc}" != 0;then
+if test $? != 0; then
 	echo "Could not read CRL $i"
 	exit 1
 fi
 
-$DIFF -I 'warning:' ${OUTFILE} "${srcdir}/data/$i"
-if test $? != 0;then
+check_if_equal ${OUTFILE} "${srcdir}/data/$i" "warning:"
+if test $? != 0; then
 	echo "Error in parsing cert with long OIDs"
 	exit 1
 fi
-- 
cgit v1.2.1