diff options
| author | Tim Rühsen <tim.ruehsen@gmx.de> | 2018-11-16 16:12:31 +0100 |
|---|---|---|
| committer | Tim Rühsen <tim.ruehsen@gmx.de> | 2018-12-13 08:52:28 +0100 |
| commit | 961c870b5149aac3e75ce87d4edeffd40d57d5bb (patch) | |
| tree | 8cf4f36a553ee94a23671c083519c173629a46c0 | |
| parent | d39b65c7e054d256d3621be5972a36571c626f5b (diff) | |
| download | gnutls-961c870b5149aac3e75ce87d4edeffd40d57d5bb.tar.gz | |
tests/cert-tests/pkcs12-corner-cases: Increase portability (fix for busybox)
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
| -rwxr-xr-x | tests/cert-tests/pkcs12-corner-cases | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/cert-tests/pkcs12-corner-cases b/tests/cert-tests/pkcs12-corner-cases index 5a0e615b3b..0b9c482db7 100755 --- a/tests/cert-tests/pkcs12-corner-cases +++ b/tests/cert-tests/pkcs12-corner-cases @@ -38,7 +38,8 @@ if ! test -z "${VALGRIND}"; then VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=6" fi -DIFF="${DIFF:-diff}" +. "${srcdir}/../scripts/common.sh" + TMPFILE="pkcs12-corner.$$.tmp" # Cases from oss-fuzz @@ -79,7 +80,7 @@ for p12 in "key-corpus-rc2-1.p12";do set -- ${p12} file="$1" "${CERTTOOL}" --p12-info --inder --password "${cpassword}" \ - --infile "${srcdir}/data/${file}" >${TMPFILE} 2>/dev/null + --infile "${srcdir}/data/${file}" | tr -d '\r' >${TMPFILE} 2>/dev/null rc=$? if test ${rc} != 0 && test ${rc} != 1; then cat ${TMPFILE} @@ -87,7 +88,7 @@ for p12 in "key-corpus-rc2-1.p12";do exit 1 fi - ${DIFF} --strip-trailing-cr ${TMPFILE} "${srcdir}/data/${file}.out" + check_if_equal ${TMPFILE} "${srcdir}/data/${file}.out" rc=$? if test ${rc} != 0;then echo "Output differs in ${file}.out ${TMPFILE}" |