Fix the name resolution tests so that they run on Windows. Enable them

by default. Remove some unused code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@49661 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/test/suite-nameres.sh b/test/suite-nameres.sh
index 081058f2dd70eaac8e669ffaa7bb8a5795576e8b..7366e278e2bc46aca1ef157aa3ae4666ddebbbf8 100755 (executable)
--- a/test/suite-nameres.sh
+++ b/test/suite-nameres.sh
@@ -28,18 +28,10 @@ EXIT_OK=0
 EXIT_COMMAND_LINE=1
 EXIT_ERROR=2
 
-
-TEST_KEYS_DIR="$PWD/keys/"
-if [ "$WS_SYSTEM" == "Windows" ] ; then
-       TEST_KEYS_DIR="`cygpath -w $TEST_KEYS_DIR`"
-fi
-
 #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_ENV="WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ${HOME_ENV}=${TEST_HOME}"
 
-DIFF_OUT=./diff-output.txt
-
 if [ "$WS_SYSTEM" == "Windows" ] ; then
        CONF_PATH="fakehome/Wireshark"
 else
@@ -177,7 +169,7 @@ name_resolution_cleanup_step() {
 name_resolution_prep_step() {
        name_resolution_cleanup_step
        mkdir -p "$CUSTOM_PROFILE_PATH"
-       cp hosts.global ../hosts
+       cp hosts.global $WS_BIN_PATH/hosts
        cp hosts.personal "$CONF_PATH/hosts"
        cp hosts.custom "$CUSTOM_PROFILE_PATH/hosts"
 }

diff --git a/test/test.sh b/test/test.sh
index 4a8da69d181f685fafe78ae27942d82b08269c1b..af8ae075a18f18a3dd6785950d2f15ffb351aefd 100755 (executable)
--- a/test/test.sh
+++ b/test/test.sh
@@ -118,7 +118,7 @@ test_suite() {
        test_suite_add "Unit tests" unittests_suite
        test_suite_add "File formats" fileformats_suite
        test_suite_add "Decryption" decryption_suite
-#      test_suite_add "Name Resolution" name_resolution_suite
+       test_suite_add "Name Resolution" name_resolution_suite
 }