updated tests and configures

diff --git a/configure.ac b/configure.ac
index e7a0497daf48e62f44e3c33d593a94458ddec4ea..2907e801aa2b0ae0fa14fbffff8a1b04a52c3259 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
-AC_INIT(libdns, 1.00, libdns@nlnetlabs.nl, libdns)
+AC_INIT(libdns, 1.0.0, libdns@nlnetlabs.nl, libdns)
 AC_CONFIG_SRCDIR([packet.c])
 
 OURCPPFLAGS='-ansi -pedantic -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600'

diff --git a/examples/configure.ac b/examples/configure.ac
index d9e5fe494721a1bba7193c7cfb99161618f1520c..5e6d2a4b93bde38e2e467f4da3c7f3251c2d13d5 100644 (file)
--- a/examples/configure.ac
+++ b/examples/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(libdns-tests, 1.0, ldns@nlnetlabs.nl, ldns-tests-1.0)
+AC_INIT(libdns-tests, 1.0.0, ldns@nlnetlabs.nl, ldns-tests-1.0.0)
 AC_CONFIG_SRCDIR([../ldns/config.h])
 
 AC_AIX

diff --git a/tests/Makefile.in b/tests/Makefile.in
index efff897970ba64ed8efdc8f0be4e6fd5723fb27b..3b8230b3c7341e13fb5d8f591093b1bc880e88c5 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -20,7 +20,7 @@ LINK            = $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS)
 HEADER         = config.h
 TESTS          = run-test0 run-test7 run-test18 run-test19 run-test20 \
                        dname-label-test notify \
-                       rrsig-test serial server ldns-mx ldns-chaos
+                       rrsig-test serial server
 
 .PHONY:        all clean realclean
 

diff --git a/tests/configure.ac b/tests/configure.ac
index d9e5fe494721a1bba7193c7cfb99161618f1520c..5e6d2a4b93bde38e2e467f4da3c7f3251c2d13d5 100644 (file)
--- a/tests/configure.ac
+++ b/tests/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(libdns-tests, 1.0, ldns@nlnetlabs.nl, ldns-tests-1.0)
+AC_INIT(libdns-tests, 1.0.0, ldns@nlnetlabs.nl, ldns-tests-1.0.0)
 AC_CONFIG_SRCDIR([../ldns/config.h])
 
 AC_AIX

diff --git a/tests/run-test18.c b/tests/run-test18.c
index 5ed19daa9559469526dacc0327c3caccbf6016c1..940bb552e4e42000aea734c4f88242020923e554 100644 (file)
--- a/tests/run-test18.c
+++ b/tests/run-test18.c
@@ -160,7 +160,7 @@ main()
 
        printf("Now we are going to verify\n");
 
-       printf("\n[%d]\n", ldns_verify(rrs, signatures, dnskeys));
+       printf("\n[%d]\n", ldns_verify(rrs, signatures, dnskeys, NULL));
        
         return 0;
 }

diff --git a/tests/run-test20.c b/tests/run-test20.c
index f8bc2900c0b8c34f14fc7513be81246feed37a1a..8907dea2659bdde980fe8feac79ea99fa8082c59 100644 (file)
--- a/tests/run-test20.c
+++ b/tests/run-test20.c
@@ -38,7 +38,8 @@ main(void)
        ldns_rr_list  *rrs;
        ldns_rr_list  *signatures;
        ldns_rr_list  *dnskeys;
-ldns_rr_list *result;
+       ldns_rr_list  *result_keys;
+       ldns_status result;
 
        /* ----- */
        FILE *f;
@@ -99,12 +100,13 @@ ldns_rr_list *result;
 
        printf("Now we are going to verify\n");
 
-       result = ldns_verify(rrs, signatures, dnskeys);
+       result_keys = ldns_rr_list_new();
+       result = ldns_verify(rrs, signatures, dnskeys, result_keys);
 
-printf("RESULT:\n");
-ldns_rr_list_print(stdout, result);
+       printf("RESULT:\n");
+       ldns_rr_list_print(stdout, result_keys);
 
-       if (result != NULL) {
+       if (result == LDNS_STATUS_OK) {
                printf("SUCCESS\n\n");
        } else {
                printf("FAILURE\n\n");