changeset 1235:7d74441a684b

* cdl/dns.cdl: CDL control of what DNS server to use for the tests * tests/dns1.c: Fine tuned the information for my server and added Iztok Zupet's Server to the test.
author asl
date Tue, 23 Sep 2003 09:10:59 +0000
parents e8cfe3629703
children c3f02caa10bd
files packages/net/ns/dns/current/ChangeLog packages/net/ns/dns/current/cdl/dns.cdl packages/net/ns/dns/current/tests/dns1.c
diffstat 3 files changed, 48 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/packages/net/ns/dns/current/ChangeLog
+++ b/packages/net/ns/dns/current/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-04  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* cdl/dns.cdl: CDL control of what DNS server to use for the tests
+	* tests/dns1.c: Fine tuned the information for my server and added
+	Iztok Zupet's Server to the test.
+
 2003-05-22  Andrew Lunn  <andrew.lunn@ascom.cd>
 
         * src/dns.c: (cyg_dns_res_start) New: Allow IPv6 to be used to
--- a/packages/net/ns/dns/current/cdl/dns.cdl
+++ b/packages/net/ns/dns/current/cdl/dns.cdl
@@ -163,7 +163,7 @@ cdl_package CYGPKG_NS_DNS {
     }
 
     cdl_option CYGPKG_NS_DNS_TESTS {
-        display "Networking tests"
+        display "DNS test"
         flavor  data
         active_if CYGPKG_NS_DNS_BUILD
         no_define
@@ -172,6 +172,24 @@ cdl_package CYGPKG_NS_DNS {
         description   "
             This option specifies the set of tests for the DNS package."
     }
-}
+
+    cdl_option CYGPKG_NS_DNS_TESTS_LUNN {
+        display        "Use Andrew Lunn's DNS server for tests"
+        default_value  1
+        description    "
+            Run the tests against Andrew Lunn's DNS server. Servers
+            come and go, IP addresses change, links are sometime down. 
+            So this may not work...."
+    }
 
+    cdl_option CYGPKG_NS_DNS_TESTS_ELSIS {
+        display        "Iztok Zupet DNS server at Elsis for tests"
+        default_value  1
+        description    "
+            Run the tests against Iztok Zupet DNS server at
+            Elsis. Servers come and go, IP addresses change, links are
+            sometime down.  So this may not work...."
+    }
+}
 # EOF dns.cdl
+
--- a/packages/net/ns/dns/current/tests/dns1.c
+++ b/packages/net/ns/dns/current/tests/dns1.c
@@ -86,10 +86,28 @@ struct test_info_s {
 };
 
 struct test_info_s test_info[] = {
+#if CYGPKG_NS_DNS_TESTS_ELSIS
     {
-        "192.168.10.1",
-        "fe80::2ff:8eff:fe04:a18d",
-        "lunn.org.",
+        "194.249.198.85",
+        NULL,
+        "test.ecos.",
+        "hostnamev4",
+        "cnamev4",
+        "192.168.88.1",
+        "hostnamev6",
+        "cnamev6",
+        "fec0::88:4:3:2:1",
+        "hostnamev46",
+        "cnamev46",
+        "192.168.88.2",
+        "fec0::88:4:3:2:2"
+    },
+#endif
+#ifdef CYGPKG_NS_DNS_TESTS_LUNN
+    {
+        "80.238.139.98",
+        "3ffe:bc0:8000::839",
+        "test.ecos.",
         "hostnamev4",
         "cnamev4",
         "192.168.88.1",
@@ -101,6 +119,7 @@ struct test_info_s test_info[] = {
         "192.168.88.2",
         "fec0::88:4:3:2:2"
     }
+#endif
 };
 
 char * familytoa(int family) {