Fix decryption test on Windows.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41856 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/test/config.sh b/test/config.sh
index b70960451094402690267e2a0bf95928717222cb..376df5d1b8a5861cac4b523bbfaf214841bde01e 100755 (executable)
--- a/test/config.sh
+++ b/test/config.sh
@@ -28,10 +28,8 @@
 if [ -n "${OS#Windows}" ] ; then
        WS_SYSTEM="Windows"
        export CYGWIN="$CYGWIN error_start=c:\cygwin\bin\dumper.exe -d %1 %2"
-       DIR_SEP="\\"
 else
        WS_SYSTEM=`uname -s`
-       DIR_SEP="/"
 fi
 
 
@@ -85,12 +83,14 @@ fi
 # Tell Wireshark to quit after capuring packets.
 export WIRESHARK_QUIT_AFTER_CAPTURE="True"
 
-CAPTURE_DIR="captures${DIR_SEP}"
+CAPTURE_DIR="captures/"
 
 # Configuration paths
 TEST_HOME="$PWD/fakehome"
+
 if [ "$WS_SYSTEM" == "Windows" ] ; then
     TEST_HOME="`cygpath -w $TEST_HOME`"
+    CAPTURE_DIR="`cygpath -w $CAPTURE_DIR`"
 fi
 
 # Display our environment

diff --git a/test/config/ssl_keys.tmpl b/test/config/ssl_keys.tmpl
index 539630194bffbc8d30e877d74091b8293212ac80..c5a612358ce9d6acec4f1d0e8a9766a0f05dd47c 100644 (file)
--- a/test/config/ssl_keys.tmpl
+++ b/test/config/ssl_keys.tmpl
@@ -1 +1 @@
-"127.0.0.1","443","http","%test_keys_dir%rsasnakeoil2.key",""
+"127.0.0.1","443","http","TEST_KEYS_DIRrsasnakeoil2.key",""

diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh
index e8a0babdf0d709b38c10bc73642af800c831923e..d6a81eb5f5d224049068a9ee25d6ff95c643cc51 100755 (executable)
--- a/test/suite-decryption.sh
+++ b/test/suite-decryption.sh
@@ -85,7 +85,7 @@ decryption_prep_step() {
                        test_remark_add "../$UAT exists. One or more tests may fail."
                else
                        echo "# Created by $DC_ID" > ../$UAT
-                       sed -e "s:%test_keys_dir%:${TEST_KEYS_DIR}:" < ./config/$UAT.tmpl >> ../$UAT
+                       sed -e "s|TEST_KEYS_DIR|${TEST_KEYS_DIR//\\/\\\\}|" < ./config/$UAT.tmpl >> ../$UAT
                fi
        done
 }