aboutsummaryrefslogtreecommitdiffstats
path: root/test/test.sh
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-10-09 17:24:16 +0000
committerEvan Huus <eapache@gmail.com>2013-10-09 17:24:16 +0000
commit4860e101c839f8a75acac073e5f733d1453d04d3 (patch)
tree032e0a7408e8ef2c5d00a23ee75c318fe4802729 /test/test.sh
parent7058b878332b5a73fd482d046eeefba2e87685d4 (diff)
Slight simplification, inline a function only ever called once.
svn path=/trunk/; revision=52470
Diffstat (limited to 'test/test.sh')
-rwxr-xr-xtest/test.sh14
1 files changed, 13 insertions, 1 deletions
diff --git a/test/test.sh b/test/test.sh
index e640ed2f3d..3d8b0795a8 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -75,7 +75,19 @@ if [ -z "$TEST_OUTDIR" ] || ! cd "$TEST_OUTDIR"; then
TEST_OUTDIR_CLEAN=0
fi
-test_build_paths
+# Configuration paths
+HOME_ENV="HOME"
+HOME_PATH="$TEST_OUTDIR/home"
+CONF_PATH="$HOME_PATH/.wireshark"
+
+if [ "$WS_SYSTEM" == "Windows" ] ; then
+ HOME_ENV="APPDATA"
+ HOME_PATH="`cygpath -w $HOME_PATH`"
+ CONF_PATH="$HOME_PATH/Wireshark"
+ CAPTURE_DIR="`cygpath -w $CAPTURE_DIR`"
+fi
+
+mkdir -p $CONF_PATH
source $TESTS_DIR/suite-clopts.sh
source $TESTS_DIR/suite-io.sh