Save keyfromlabel error output

Save the error output from pkcs11-tool and dnssec-keyfromlabel in the
engine_pkcs11 system test.

diff --git a/bin/tests/system/engine_pkcs11/clean.sh b/bin/tests/system/engine_pkcs11/clean.sh
index 6440e2661b7b1f2ff5f0293f4f20d59de1686a45..6190bd2ebb90e05c423b644b4e4995525f6cf652 100644 (file)
--- a/bin/tests/system/engine_pkcs11/clean.sh
+++ b/bin/tests/system/engine_pkcs11/clean.sh
@@ -19,8 +19,8 @@ set -e
 rm -f dig.out.*
 rm -f dsset-*
 rm -f pin
-rm -f keyfromlabel.out.*
-rm -f pkcs11-tool.out.*
+rm -f keyfromlabel.err.* keyfromlabel.out.*
+rm -f pkcs11-tool.err.* pkcs11-tool.out.*
 rm -f signer.out.*
 rm -f ns1/*.example.db ns1/*.example.db.signed
 rm -f ns1/*.kskid1 ns1/*.kskid2 ns1/*.zskid1 ns1/*.zskid2

diff --git a/bin/tests/system/engine_pkcs11/setup.sh b/bin/tests/system/engine_pkcs11/setup.sh
index 2f2f6e11008164277270d45cff59f1e4c6e9d5ac..5b425f91c23e56fc2ec80ec8d766042f02670f60 100644 (file)
--- a/bin/tests/system/engine_pkcs11/setup.sh
+++ b/bin/tests/system/engine_pkcs11/setup.sh
@@ -31,7 +31,7 @@ keygen() {
 
        label="${id}-${zone}"
        p11id=$(echo "${label}" | sha1sum - | awk '{print $1}')
-       pkcs11-tool --module $SOFTHSM2_MODULE --token-label "softhsm2-engine_pkcs11" -l -k --key-type $type:$bits --label "${label}" --id "${p11id//$'\n'/}" --pin $(cat $PWD/pin) > pkcs11-tool.out.$zone.$id || return 1
+       pkcs11-tool --module $SOFTHSM2_MODULE --token-label "softhsm2-engine_pkcs11" -l -k --key-type $type:$bits --label "${label}" --id "${p11id//$'\n'/}" --pin $(cat $PWD/pin) > pkcs11-tool.out.$zone.$id 2> pkcs11-tool.err.$zone.$id || return 1
 }
 
 keyfromlabel() {
@@ -41,7 +41,7 @@ keyfromlabel() {
        dir="$4"
         shift 4
 
-       $KEYFRLAB -K $dir -E pkcs11 -a $alg -l "token=softhsm2-engine_pkcs11;object=${id}-${zone};pin-source=$PWD/pin" "$@" $zone >> keyfromlabel.out.$zone.$id 2>> /dev/null || return 1
+       $KEYFRLAB -K $dir -E pkcs11 -a $alg -l "token=softhsm2-engine_pkcs11;object=${id}-${zone};pin-source=$PWD/pin" "$@" $zone >> keyfromlabel.out.$zone.$id 2> keyfromlabel.err.$zone.$id || return 1
        cat keyfromlabel.out.$zone.$id
 }