diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-03-30 21:04:09 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-03-30 21:04:09 +0000 |
| commit | f21274b7c202dd2b760b5bdafdfcfd3bc939d5d6 (patch) | |
| tree | c09fedb27dc81a86c88c0bafcbd7acabc31ef132 /test | |
| parent | 22be69a1902aab7922833738e472179cefda6ac0 (diff) | |
Clobber our personal configuration directory on Windows.
svn path=/trunk/; revision=41860
Diffstat (limited to 'test')
| -rwxr-xr-x | test/config.sh | 6 | ||||
| -rwxr-xr-x | test/suite-decryption.sh | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/config.sh b/test/config.sh index 376df5d1b8..0b1f1328b9 100755 --- a/test/config.sh +++ b/test/config.sh @@ -87,10 +87,12 @@ CAPTURE_DIR="captures/" # Configuration paths TEST_HOME="$PWD/fakehome" +HOME_ENV="HOME" if [ "$WS_SYSTEM" == "Windows" ] ; then - TEST_HOME="`cygpath -w $TEST_HOME`" - CAPTURE_DIR="`cygpath -w $CAPTURE_DIR`" + TEST_HOME="`cygpath -w $TEST_HOME`" + HOME_ENV="APPDATA" + CAPTURE_DIR="`cygpath -w $CAPTURE_DIR`" fi # Display our environment diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh index ed03ab095f..dd9b1efa6e 100755 --- a/test/suite-decryption.sh +++ b/test/suite-decryption.sh @@ -40,7 +40,7 @@ fi #TS_ARGS="-Tfields -e frame.number -e frame.time_epoch -e frame.time_delta" TS_DC_ARGS="" -TS_DC_ENV="HOME=${TEST_HOME}" +TS_DC_ENV="${HOME_ENV}=${TEST_HOME}" DIFF_OUT=./diff-output.txt |