diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-11-28 18:51:14 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-11-28 18:51:14 +0000 |
| commit | 5640b8665feebed66db25268d588cd233c2fab6e (patch) | |
| tree | 05e2464be6f887aad6f505a74da2a9eb0b4f9ab0 | |
| parent | 07f5f270b2dc20ebd493ae357a3fcc99e918a3a4 (diff) | |
| parent | e45e48abe5b6f0e1f4d038cb72a8ae1187708508 (diff) | |
| download | gnutls-5640b8665feebed66db25268d588cd233c2fab6e.tar.gz | |
Merge branch 'fix-mingw' into 'master'
tests: fix crl test under MinGW32/64
See merge request gnutls/gnutls!824
| -rwxr-xr-x | tests/cert-tests/crl | 2 | ||||
| -rwxr-xr-x | tests/cert-tests/crq | 2 | ||||
| -rwxr-xr-x | tests/cert-tests/pem-decoding | 6 | ||||
| -rwxr-xr-x | tests/cert-tests/privkey-import | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/cert-tests/crl b/tests/cert-tests/crl index 15fa44b844..bea0c5237e 100755 --- a/tests/cert-tests/crl +++ b/tests/cert-tests/crl @@ -55,7 +55,7 @@ if test "${rc}" != "0"; then exit ${rc} fi -${VALGRIND} "${CERTTOOL}" --crl-info --infile ${OUTFILE} --no-text >${TMP2FILE} +${VALGRIND} "${CERTTOOL}" --crl-info --infile ${OUTFILE} --no-text --outfile ${TMP2FILE} rc=$? if test "${rc}" != "0"; then diff --git a/tests/cert-tests/crq b/tests/cert-tests/crq index 2c59930fef..58581e4148 100755 --- a/tests/cert-tests/crq +++ b/tests/cert-tests/crq @@ -66,7 +66,7 @@ datefudge -s "2007-04-22" \ --template "${srcdir}/templates/template-tlsfeature.tmpl" \ --outfile $OUTFILE 2>/dev/null -${CERTTOOL} --crq-info --no-text --infile ${OUTFILE} > ${TMPFILE} +${CERTTOOL} --crq-info --no-text --infile ${OUTFILE} --outfile ${TMPFILE} rc=$? if test "${rc}" != "0"; then diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding index 7419656d02..c5ba22e26d 100755 --- a/tests/cert-tests/pem-decoding +++ b/tests/cert-tests/pem-decoding @@ -180,7 +180,7 @@ if test "${rc}" != "0"; then fi #check if --no-text works as expected -${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/data/cert-ecc256.pem" --no-text >${TMPFILE} +${VALGRIND} "${CERTTOOL}" --certificate-info --infile "${srcdir}/data/cert-ecc256.pem" --no-text --outfile ${TMPFILE} rc=$? if test "${rc}" != "0"; then @@ -194,7 +194,7 @@ if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$\|^[A-Za-z0-9/+=]\+$\|^-----END [A-Z0-9 fi #check if --no-text works as expected -${VALGRIND} "${CERTTOOL}" --certificate-pubkey --infile "${srcdir}/data/cert-ecc256.pem" --no-text >${TMPFILE} +${VALGRIND} "${CERTTOOL}" --certificate-pubkey --infile "${srcdir}/data/cert-ecc256.pem" --no-text --outfile ${TMPFILE} rc=$? if test "${rc}" != "0"; then @@ -208,7 +208,7 @@ if grep -v '^-----BEGIN [A-Z0-9 ]\+-----$\|^[A-Za-z0-9/+=]\+$\|^-----END [A-Z0-9 fi #check if --no-text works as expected -${VALGRIND} "${CERTTOOL}" --pubkey-info --infile "${srcdir}/data/cert-ecc256.pem" --no-text >${TMPFILE} +${VALGRIND} "${CERTTOOL}" --pubkey-info --infile "${srcdir}/data/cert-ecc256.pem" --no-text --outfile ${TMPFILE} rc=$? if test "${rc}" != "0"; then diff --git a/tests/cert-tests/privkey-import b/tests/cert-tests/privkey-import index afac285463..f3f94806fa 100755 --- a/tests/cert-tests/privkey-import +++ b/tests/cert-tests/privkey-import @@ -44,7 +44,7 @@ if test "${rc}" != "0";then fi done -${VALGRIND} "${CERTTOOL}" -k --infile "${srcdir}/data/privkey1.pem" --no-text >${TMPFILE} +${VALGRIND} "${CERTTOOL}" -k --infile "${srcdir}/data/privkey1.pem" --no-text --outfile ${TMPFILE} rc=$? if test "${rc}" != "0"; then |