diff options
| author | Evan Huus <eapache@gmail.com> | 2013-10-06 23:29:59 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-10-06 23:29:59 +0000 |
| commit | 087c885c667cf11a24a0730fc5d54dfcdb933ad4 (patch) | |
| tree | af84500e740885597254a028c9168d72f5ec9827 /test/config.sh | |
| parent | 0c25744c67f4ffbb6c48ca63629532aeef4397b9 (diff) | |
| download | wireshark-087c885c667cf11a24a0730fc5d54dfcdb933ad4.tar.gz | |
More tweaking of test suite path variables, trying to make everything play
nicely on Windows and Linux both.
svn path=/trunk/; revision=52428
Diffstat (limited to 'test/config.sh')
| -rwxr-xr-x | test/config.sh | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/test/config.sh b/test/config.sh index ac7c27a760..a8223cc314 100755 --- a/test/config.sh +++ b/test/config.sh @@ -99,13 +99,22 @@ export WIRESHARK_QUIT_AFTER_CAPTURE="True" CAPTURE_DIR="$TESTS_DIR/captures/" -# Configuration paths -HOME_ENV="HOME" - -if [ "$WS_SYSTEM" == "Windows" ] ; then - HOME_ENV="APPDATA" - CAPTURE_DIR="`cygpath -w $CAPTURE_DIR`" -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 +} # Display our environment |