diff options
| author | Evan Huus <eapache@gmail.com> | 2013-10-06 18:57:01 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-10-06 18:57:01 +0000 |
| commit | 62c230c7b1117e35b0ab1c739919b526b491c8b2 (patch) | |
| tree | 3b8ce65af0697afb4ab80f1fa5de2875f5c16483 /test/suite-nameres.sh | |
| parent | 7888bec0bc68904ba62c8dc3eb626a20e636d4a4 (diff) | |
From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9174
Reorg more of the test variables, still separating source and test directories.
More minor fixes from me.
svn path=/trunk/; revision=52412
Diffstat (limited to 'test/suite-nameres.sh')
| -rwxr-xr-x | test/suite-nameres.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/suite-nameres.sh b/test/suite-nameres.sh index 672ac65114..6bc7724a64 100755 --- a/test/suite-nameres.sh +++ b/test/suite-nameres.sh @@ -30,16 +30,8 @@ EXIT_ERROR=2 #TS_ARGS="-Tfields -e frame.number -e frame.time_epoch -e frame.time_delta" TS_NR_ARGS="-r $CAPTURE_DIR/dns+icmp.pcapng.gz" -TS_NR_ENV="WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ${HOME_ENV}=${TEST_HOME}" - -if [ "$WS_SYSTEM" == "Windows" ] ; then - CONF_PATH="$TEST_HOME/Wireshark" -else - CONF_PATH="$TEST_HOME/.wireshark" -fi CUSTOM_PROFILE_NAME="Custom-$$" -CUSTOM_PROFILE_PATH="$CONF_PATH/profiles/$CUSTOM_PROFILE_NAME" # nameres.network_name: True # nameres.use_external_name_resolver: False @@ -167,6 +159,14 @@ name_resolution_cleanup_step() { } name_resolution_prep_step() { + if [ "$WS_SYSTEM" == "Windows" ] ; then + CONF_PATH="$TEST_OUTDIR/home/Wireshark" + else + CONF_PATH="$TEST_OUTDIR/home/.wireshark" + fi + CUSTOM_PROFILE_PATH="$CONF_PATH/profiles/$CUSTOM_PROFILE_NAME" + TS_NR_ENV="WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ${HOME_ENV}=${TEST_OUTDIR}/home" + name_resolution_cleanup_step mkdir -p "$CUSTOM_PROFILE_PATH" cp "$TESTS_DIR/hosts.global" "$WS_BIN_PATH/hosts" |