From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 26 Oct 2013 16:12:46 +0000 (+0200)
Subject: diff is now a parameter allowing to override it.
X-Git-Tag: gnutls_3_2_6~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5218c324c0754b3f0ebcde883bf1050ed6d50c4;p=thirdparty%2Fgnutls.git

diff is now a parameter allowing to override it.
---

diff --git a/tests/cert-tests/aki b/tests/cert-tests/aki
index c212471169..e5a5f423fd 100755
--- a/tests/cert-tests/aki
+++ b/tests/cert-tests/aki
@@ -24,11 +24,12 @@ set -e
 
 srcdir=${srcdir:-.}
 CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
+DIFF=${DIFF:-diff}
 
 $CERTTOOL --certificate-info --infile $srcdir/aki-cert.pem \
 	  --outfile tmp-aki.pem
 
-diff $srcdir/aki-cert.pem tmp-aki.pem
+$DIFF $srcdir/aki-cert.pem tmp-aki.pem
 rc=$?
 
 # We're done.
diff --git a/tests/cert-tests/dane b/tests/cert-tests/dane
index 2194807678..c43d7d9f6b 100755
--- a/tests/cert-tests/dane
+++ b/tests/cert-tests/dane
@@ -24,12 +24,13 @@ set -e
 
 srcdir=${srcdir:-.}
 DANETOOL=${DANETOOL:-../../src/danetool$EXEEXT}
+DIFF=${DIFF:-diff}
 
 test -e $DANETOOL || exit 77
 
 $DANETOOL --tlsa-rr --load-certificate $srcdir/cert-ecc256.pem --host www.example.com --outfile tmp-dane.rr 2>/dev/null
 
-diff $srcdir/dane-test.rr tmp-dane.rr
+$DIFF $srcdir/dane-test.rr tmp-dane.rr
 rc=$?
 
 rm -f tmp-dane.rr
diff --git a/tests/cert-tests/pathlen b/tests/cert-tests/pathlen
index 5bfdbc9b3f..01af21e2cc 100755
--- a/tests/cert-tests/pathlen
+++ b/tests/cert-tests/pathlen
@@ -24,15 +24,16 @@ set -e
 
 srcdir=${srcdir:-.}
 CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
+DIFF=${DIFF:-diff}
 
 $CERTTOOL --certificate-info --infile $srcdir/ca-no-pathlen.pem \
 	  --outfile new-ca-no-pathlen.pem
 $CERTTOOL --certificate-info --infile $srcdir/no-ca-or-pathlen.pem \
 	  --outfile new-no-ca-or-pathlen.pem
 
-diff $srcdir/ca-no-pathlen.pem new-ca-no-pathlen.pem
+$DIFF $srcdir/ca-no-pathlen.pem new-ca-no-pathlen.pem
 rc1=$?
-diff $srcdir/no-ca-or-pathlen.pem new-no-ca-or-pathlen.pem
+$DIFF $srcdir/no-ca-or-pathlen.pem new-no-ca-or-pathlen.pem
 rc2=$?
 
 
diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
index 1459e39010..5e28e96cc4 100755
--- a/tests/cert-tests/pem-decoding
+++ b/tests/cert-tests/pem-decoding
@@ -24,6 +24,7 @@
 
 srcdir=${srcdir:-.}
 CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
+DIFF=${DIFF:-diff}
 
 #check whether "funny" spaces can be interpreted
 $CERTTOOL --certificate-info --infile $srcdir/funny-spacing.pem >/dev/null 2>&1
@@ -44,7 +45,7 @@ if test "$rc" != "0"; then
   exit $rc
 fi
 
-diff --strip-trailing-cr $srcdir/bmpstring.pem tmp-pem.pem
+$DIFF --strip-trailing-cr $srcdir/bmpstring.pem tmp-pem.pem
 rc=$?
 
 if test "$rc" != "0"; then
@@ -63,7 +64,7 @@ fi
 
 cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1
 cat tmp-pem.pem |grep -v "Not After:" >tmp2
-diff --strip-trailing-cr tmp1 tmp2
+$DIFF --strip-trailing-cr tmp1 tmp2
 rc=$?
 
 if test "$rc" != "0"; then