summaryrefslogtreecommitdiff
path: root/test/config.sh
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-03-30 18:13:41 +0000
committerGerald Combs <gerald@wireshark.org>2012-03-30 18:13:41 +0000
commit3a20e1061552455f5f3ddc32e0f95e82f3df5def (patch)
tree0e7613e99b4d8af8b93779209a8d4a52381f731e /test/config.sh
parent46e68bab2bdb17d28e8fbc0fb6b63ab726abcdee (diff)
downloadwireshark-3a20e1061552455f5f3ddc32e0f95e82f3df5def.tar.gz
Fix decryption test on Windows.
svn path=/trunk/; revision=41856
Diffstat (limited to 'test/config.sh')
-rwxr-xr-xtest/config.sh6
1 files changed, 3 insertions, 3 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