diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-03-30 18:13:41 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-03-30 18:13:41 +0000 |
| commit | 3a20e1061552455f5f3ddc32e0f95e82f3df5def (patch) | |
| tree | 0e7613e99b4d8af8b93779209a8d4a52381f731e /test | |
| parent | 46e68bab2bdb17d28e8fbc0fb6b63ab726abcdee (diff) | |
| download | wireshark-3a20e1061552455f5f3ddc32e0f95e82f3df5def.tar.gz wireshark-3a20e1061552455f5f3ddc32e0f95e82f3df5def.tar.bz2 wireshark-3a20e1061552455f5f3ddc32e0f95e82f3df5def.zip | |
Fix decryption test on Windows.
svn path=/trunk/; revision=41856
Diffstat (limited to 'test')
| -rwxr-xr-x | test/config.sh | 6 | ||||
| -rw-r--r-- | test/config/ssl_keys.tmpl | 2 | ||||
| -rwxr-xr-x | test/suite-decryption.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/config.sh b/test/config.sh index b709604510..376df5d1b8 100755 --- 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 539630194b..c5a612358c 100644 --- 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 e8a0babdf0..d6a81eb5f5 100755 --- 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 } |