From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9174

Support running most tests out-of-tree. Use case is to have a source tree and
use a semi-unprivileged user to perform tests (to rule out interference).

From me:
- fix unit-test suite, it has to build the binaries it runs so it must
  more-or-less ignore the out-of-tree stuff
- fix name-res suite, just missing a path qualifier


svn path=/trunk/; revision=52397

1 files changed, 6 insertions, 6 deletions

diff --git a/test/suite-nameres.sh b/test/suite-nameres.sh
index 7366e278e2..672ac65114 100755
--- a/test/suite-nameres.sh
+++ b/test/suite-nameres.sh
@@ -29,13 +29,13 @@ EXIT_COMMAND_LINE=1
 EXIT_ERROR=2
 
 #TS_ARGS="-Tfields -e frame.number -e frame.time_epoch -e frame.time_delta"
-TS_NR_ARGS="-r captures/dns+icmp.pcapng.gz"
+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="fakehome/Wireshark"
+	CONF_PATH="$TEST_HOME/Wireshark"
 else
-	CONF_PATH="fakehome/.wireshark"
+	CONF_PATH="$TEST_HOME/.wireshark"
 fi
 
 CUSTOM_PROFILE_NAME="Custom-$$"
@@ -169,9 +169,9 @@ name_resolution_cleanup_step() {
 name_resolution_prep_step() {
 	name_resolution_cleanup_step
 	mkdir -p "$CUSTOM_PROFILE_PATH"
-	cp hosts.global $WS_BIN_PATH/hosts
-	cp hosts.personal "$CONF_PATH/hosts"
-	cp hosts.custom "$CUSTOM_PROFILE_PATH/hosts"
+	cp "$TESTS_DIR/hosts.global" "$WS_BIN_PATH/hosts"
+	cp "$TESTS_DIR/hosts.personal" "$CONF_PATH/hosts"
+	cp "$TESTS_DIR/hosts.custom" "$CUSTOM_PROFILE_PATH/hosts"
 }
 
 name_resolution_suite() {