[xmlsec] more test tweaks

[Aleksey Sanin <aleksey src gnome org>]

commit df9ddb7acd8a1dae612a748939817304118e260c
Author: Aleksey Sanin <aleksey aleksey com>
Date:   Fri Apr 30 15:05:47 2010 -0700

    more test tweaks

 tests/testDSig.sh |    4 ++--
 tests/testrun.sh  |   34 +++++++++++++++++++++-------------
 2 files changed, 23 insertions(+), 15 deletions(-)
---
diff --git a/tests/testDSig.sh b/tests/testDSig.sh
index 7e25938..854c604 100755
--- a/tests/testDSig.sh
+++ b/tests/testDSig.sh
@@ -311,7 +311,7 @@ execDSigTest $res_success \
     "aleksey-xmldsig-01/x509data-test" \
     "xpath2 sha1 rsa-sha1" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format" \
-    "$priv_key_option tests/keys/rsakey.$priv_key_format --pwd secret" \
+    "$priv_key_option $topfolder/tests/keys/rsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format"
 
 execDSigTest $res_success \
@@ -319,7 +319,7 @@ execDSigTest $res_success \
     "aleksey-xmldsig-01/x509data-sn-test" \
     "xpath2 sha1 rsa-sha1" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --untrusted-$cert_format $topfolder/keys/ca2cert.$cert_format  --untrusted-$cert_format $topfolder/keys/rsacert.$cert_format --enabled-key-data x509" \
-    "$priv_key_option tests/keys/rsakey.$priv_key_format --pwd secret" \
+    "$priv_key_option $topfolder/tests/keys/rsakey.$priv_key_format --pwd secret" \
     "--trusted-$cert_format $topfolder/keys/cacert.$cert_format --untrusted-$cert_format $topfolder/keys/ca2cert.$cert_format  --untrusted-$cert_format $topfolder/keys/rsacert.$cert_format --enabled-key-data x509"
 
 ##########################################################################
diff --git a/tests/testrun.sh b/tests/testrun.sh
index 491d144..ead2fb5 100755
--- a/tests/testrun.sh
+++ b/tests/testrun.sh
@@ -54,6 +54,7 @@ else
     tmpfile=$TMPFOLDER/$testname.$timestamp-$$.tmp
     logfile=$TMPFOLDER/$testname.$timestamp-$$.log
 fi
+nssdbfolder=$topfolder/nssdb
 
 #
 # Valgrind
@@ -127,6 +128,10 @@ execKeysTest() {
     key_name="$3"
     alg_name="$4"
 
+    # prepare
+    rm -f $tmpfile
+    old_pwd=`pwd`
+
     # check params
     if [ "z$expected_res" != "z$res_success" -a "z$expected_res" != "z$res_fail" ] ; then
         echo " Bad parameter: expected_res=$expected_res"
@@ -158,6 +163,10 @@ execKeysTest() {
     echo "$xmlsec_app keys $params $xmlsec_params $keysfile" >>  $logfile 
     $VALGRIND $xmlsec_app keys $params $xmlsec_params $keysfile >> $logfile 2>> $logfile
     printRes $expected_res $?
+
+    # cleanup
+    cd $old_pwd
+    rm -f $tmpfile
 }
 
 #
@@ -172,6 +181,10 @@ execDSigTest() {
     params2="$6"
     params3="$7"
 
+    # prepare
+    rm -f $tmpfile
+    old_pwd=`pwd`
+
     # check params
     if [ "z$expected_res" != "z$res_success" -a "z$expected_res" != "z$res_fail" ] ; then
         echo " Bad parameter: expected_res=$expected_res"
@@ -189,7 +202,6 @@ execDSigTest() {
         echo "Test: $folder/$filename ($expected_res)" >> $logfile
     fi
 
-
     # check transforms
     if [ -n "$req_transforms" ] ; then
         printf "    Checking required transforms                         "
@@ -205,10 +217,6 @@ execDSigTest() {
         fi
     fi
 
-    # prepare
-    rm -f $tmpfile
-    old_pwd=`pwd`
-
     # run tests
     if [ -n "$params1" ] ; then
         printf "    Verify existing signature                            "
@@ -248,6 +256,10 @@ execEncTest() {
     params2="$6"
     params3="$7"
 
+    # prepare
+    rm -f $tmpfile $tmpfile.2
+    old_pwd=`pwd`
+
     # check params
     if [ "z$expected_res" != "z$res_success" -a "z$expected_res" != "z$res_fail" ] ; then
         echo " Bad parameter: expected_res=$expected_res"
@@ -279,10 +291,6 @@ execEncTest() {
         fi
     fi
 
-    # prepare
-    rm -f $tmpfile $tmpfile.2
-    old_pwd=`pwd`
-
     # run tests
     if [ -n "$params1" ] ; then
         rm -f $tmpfile
@@ -333,6 +341,10 @@ execXkmsServerRequestTest() {
     response="$5"
     params1="$6"
 
+    # prepare
+    rm -f $tmpfile $tmpfile.2 tmpfile.3
+    old_pwd=`pwd`
+
     # check params
     if [ "z$expected_res" != "z$res_success" -a "z$expected_res" != "z$res_fail" ] ; then
         echo " Bad parameter: expected_res=$expected_res"
@@ -366,10 +378,6 @@ execXkmsServerRequestTest() {
         fi
     fi
 
-    # prepare
-    rm -f $tmpfile $tmpfile.2 tmpfile.3
-    old_pwd=`pwd`
-
     # run tests
     if [ -n "$params1" ] ; then
         printf "    Processing xkms request                              "