aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-03-30 20:58:44 +0000
committerGerald Combs <gerald@wireshark.org>2012-03-30 20:58:44 +0000
commit22be69a1902aab7922833738e472179cefda6ac0 (patch)
tree08bc7a0802ae23541b705fee15d99a36f482e288 /test
parentc4678fb771520c7cf4858437861a4527a01da925 (diff)
More fixes for Windows. UATs need to be created in ../wireshark-gtk2
and backslashes need to be escaped. svn path=/trunk/; revision=41859
Diffstat (limited to 'test')
-rwxr-xr-xtest/suite-decryption.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh
index c4ac8ec8e1..ed03ab095f 100755
--- a/test/suite-decryption.sh
+++ b/test/suite-decryption.sh
@@ -67,10 +67,10 @@ tshark_decryption_suite() {
decryption_cleanup_step() {
for UAT in $UAT_FILES ; do
- grep $DC_ID ../$UAT > /dev/null 2>&1
+ grep $DC_ID $WS_BIN_PATH/$UAT > /dev/null 2>&1
RETURNVALUE=$?
if [ $RETURNVALUE -eq $EXIT_OK ]; then
- rm -f ../$UAT
+ rm -f $WS_BIN_PATH/$UAT
fi
done
rm -rf fakehome
@@ -81,11 +81,11 @@ decryption_prep_step() {
mkdir fakehome
for UAT in $UAT_FILES ; do
- if [ -f ../$UAT ] ; then
- test_remark_add "../$UAT exists. One or more tests may fail."
+ if [ -f $WS_BIN_PATH/$UAT ] ; then
+ test_remark_add "$WS_BIN_PATH/$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
+ echo "# Created by $DC_ID" > $WS_BIN_PATH/$UAT
+ sed -e "s|TEST_KEYS_DIR|${TEST_KEYS_DIR//\\/\\\\x5c}|" < ./config/$UAT.tmpl >> $WS_BIN_PATH/$UAT
fi
done
}