Fix check for the presence of IDNA.

diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
index ed2a5b2fbe7861a256bb0af42fb63c7c60025956..0c20930cc4088e3a715534949a8ca25c3d969a31 100644 (file)
--- a/bin/tests/system/feature-test.c
+++ b/bin/tests/system/feature-test.c
@@ -153,7 +153,7 @@ main(int argc, char **argv) {
        }
 
        if (strcmp(argv[1], "--with-idn") == 0) {
-#ifdef WITH_IDN
+#ifdef WITH_LIBIDN2
                return (0);
 #else
                return (1);

diff --git a/bin/tests/system/idna/prereq.sh b/bin/tests/system/idna/prereq.sh
deleted file mode 100644 (file)
index dad4c59..0000000
--- a/bin/tests/system/idna/prereq.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-SYSTEMTESTTOP=..
-. $SYSTEMTESTTOP/conf.sh
-
-$FEATURETEST --with-idn
-if [ $? -ne 1 ]; then
-    echo_i "This test requires that BIND be built with IDN support"
-    exit 
-fi
-exit 0

diff --git a/bin/tests/system/idna/tests.sh b/bin/tests/system/idna/tests.sh
index 7684c7a13707cd6629f3deb0c64a45e52b50d2ff..711a0250cbf9fafe7024d579acf9ca4f6273e605 100644 (file)
--- a/bin/tests/system/idna/tests.sh
+++ b/bin/tests/system/idna/tests.sh
@@ -307,14 +307,14 @@ idna_enabled_test() {
 
 idna_disabled_test() {
     echo_i "IDNA is disabled, only case mapping tests will be performed"
-    case_preservation_test
+    ascii_case_preservation_test
 }
 
 
 # Main test begins here
 
 $FEATURETEST --with-idn
-if [ $? -eq 1 ]; then
+if [ $? -eq 0 ]; then
     idna_enabled_test
 else
     idna_disabled_test