tests ported to 1.1.0

diff --git a/tests/dname-label-test.c b/tests/dname-label-test.c
index 798fe71fe68b15a4e47d34294a5119bb59b43eb7..e4d95408a8e94025fddb07fc66530d523a1fe903 100644 (file)
--- a/tests/dname-label-test.c
+++ b/tests/dname-label-test.c
@@ -60,13 +60,13 @@ main(int argc, char **argv)
        if (ldns_dname_is_subdomain(test2, test)) {
                printf("Yes, it's a subdomain\n");
        } else {
-               printf("Go fuck your self\n");
+               printf("error\n");
        }
 
        if (ldns_dname_is_subdomain(child, parent)) {
                printf("Yes, it's a subdomain\n");
        } else {
-               printf("Go fuck your self\n");
+               printf("error\n");
        }
        
        return 0;

diff --git a/tests/rrsig-test.c b/tests/rrsig-test.c
index 5f5f42ccaacbcaaa6ba4a962ef4894e3ffdd3026..fde2f486672ffada4af1dfe60951909358a83ca3 100644 (file)
--- a/tests/rrsig-test.c
+++ b/tests/rrsig-test.c
@@ -18,7 +18,7 @@ int main(void)
 
        printf("tweemacht %u\n", tweemacht);
 
-       sig = ldns_rr_new_frm_str("jelte.nlnetlabs.nl.     18000   IN      RRSIG   NSEC RSASHA1 3 18000 20050913235001 20050814235001 43791 nlnetlabs.nl. epWGR0WkhWQ1h0eXvU89W57xwI0xuUlWtvvUnABQVmUfZ2nGllIy2KLR5cfgpB5UH7beASrAo78AlPddPCnH50OYNjllesDy9HLderQtjQoi47SPPluLC6v3Fwqq64Zv0wf2fPzJqDSnOOrQPVzIuB3IDv5XD4M5t8Vze8QZ8lA=", 0, NULL);
+       sig = ldns_rr_new_frm_str("jelte.nlnetlabs.nl.     18000   IN      RRSIG   NSEC RSASHA1 3 18000 20050913235001 20050814235001 43791 nlnetlabs.nl. epWGR0WkhWQ1h0eXvU89W57xwI0xuUlWtvvUnABQVmUfZ2nGllIy2KLR5cfgpB5UH7beASrAo78AlPddPCnH50OYNjllesDy9HLderQtjQoi47SPPluLC6v3Fwqq64Zv0wf2fPzJqDSnOOrQPVzIuB3IDv5XD4M5t8Vze8QZ8lA=", 0, NULL, NULL);
 
        ldns_rr_print(stdout, sig);
 

diff --git a/tests/run-test18.c b/tests/run-test18.c
index 428d32bb9f01af1777917a7d247ea0b253bad95f..4eeec0da7d39e768d9b486331cae4a3288027b5f 100644 (file)
--- a/tests/run-test18.c
+++ b/tests/run-test18.c
@@ -38,11 +38,11 @@ main()
        dnskeys = ldns_rr_list_new();
 
        /* well formed */
-       rr = ldns_rr_new_frm_str("a.miek.nl.   1800   IN   A    195.169.222.38\na.miek.nl.   1800   IN   A    195.169.222.38", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl.   1800   IN   A    195.169.222.38\na.miek.nl.   1800   IN   A    195.169.222.38", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
-       rr = ldns_rr_new_frm_str("a.miek.nl.   1800   IN   A    195.169.222.38    ", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl.   1800   IN   A    195.169.222.38    ", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
@@ -61,62 +61,62 @@ main()
 3600 ; negative caching\n\
 )"; 
 
-       rr = ldns_rr_new_frm_str(soa_string1, 0, NULL);
+       rr = ldns_rr_new_frm_str(soa_string1, 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
-       rr = ldns_rr_new_frm_str(soa_string2, 0, NULL);
+       rr = ldns_rr_new_frm_str(soa_string2, 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
-       rr = ldns_rr_new_frm_str("a.miek.nl. 1800    IN     MX     10    www.atoom.net", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl. 1800    IN     MX     10    www.atoom.net", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
-       rr = ldns_rr_new_frm_str("a.miek.nl. 1800    IN     MX     10    w\\065.atoom.net", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl. 1800    IN     MX     10    w\\065.atoom.net", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
-       rr = ldns_rr_new_frm_str("a.miek.nl. 1800    IN     MX     10    w\\65.atoom.net", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl. 1800    IN     MX     10    w\\65.atoom.net", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
-       rr = ldns_rr_new_frm_str("a.miek.nl. 1800    IN     MX     10    www\\.www.atoom.net", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl. 1800    IN     MX     10    www\\.www.atoom.net", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
-       rr = ldns_rr_new_frm_str("a.miek.nl. 1800    IN     MX     10    \\.", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl. 1800    IN     MX     10    \\.", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
        printf("rr sig with inception as epoch number\n");
-       rr = ldns_rr_new_frm_str("nlnetlabs.nl.       86400  IN  RRSIG    DNSKEY RSASHA1 2 86400 1114695776 1112103776 43791 nlnetlabs.nl.  FE//RZ0Z1sMzea0ioOLFpUIcM3wnxLGndtKUXJSM3SQ3BlYok2fUTiI+zegNoB1YdylWsfohZJfjkODrOJO9PSbN7hMHmzFEsDFAbCU75TySBuxv2UQlQVuTznxtRdvLGIRGxRhPmjlc/gtJPMB4XJKUWmtkzlTVKqZU7oNCsLA=", 0, NULL);
+       rr = ldns_rr_new_frm_str("nlnetlabs.nl.       86400  IN  RRSIG    DNSKEY RSASHA1 2 86400 1114695776 1112103776 43791 nlnetlabs.nl.  FE//RZ0Z1sMzea0ioOLFpUIcM3wnxLGndtKUXJSM3SQ3BlYok2fUTiI+zegNoB1YdylWsfohZJfjkODrOJO9PSbN7hMHmzFEsDFAbCU75TySBuxv2UQlQVuTznxtRdvLGIRGxRhPmjlc/gtJPMB4XJKUWmtkzlTVKqZU7oNCsLA=", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
        printf("rr sig with inception as date\n");
-       rr = ldns_rr_new_frm_str("nlnetlabs.nl.       86400  IN  RRSIG    DNSKEY RSASHA1 2 86400 20050105121300 1112103776 43791 nlnetlabs.nl.  FE//RZ0Z1sMzea0ioOLFpUIcM3wnxLGndtKUXJSM3SQ3BlYok2fUTiI+zegNoB1YdylWsfohZJfjkODrOJO9PSbN7hMHmzFEsDFAbCU75TySBuxv2UQlQVuTznxtRdvLGIRGxRhPmjlc/gtJPMB4XJKUWmtkzlTVKqZU7oNCsLA=", 0, NULL);
+       rr = ldns_rr_new_frm_str("nlnetlabs.nl.       86400  IN  RRSIG    DNSKEY RSASHA1 2 86400 20050105121300 1112103776 43791 nlnetlabs.nl.  FE//RZ0Z1sMzea0ioOLFpUIcM3wnxLGndtKUXJSM3SQ3BlYok2fUTiI+zegNoB1YdylWsfohZJfjkODrOJO9PSbN7hMHmzFEsDFAbCU75TySBuxv2UQlQVuTznxtRdvLGIRGxRhPmjlc/gtJPMB4XJKUWmtkzlTVKqZU7oNCsLA=", 0, NULL, NULL);
 
        ldns_rr_print(stdout, rr);
        printf("\n");
        
        /* miss formed */
-       rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN MX 10", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
-       rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN A 267.271.122.1t", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl. 1800 IN A 267.271.122.1t", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
        printf("this must work again\n");
-       rr = ldns_rr_new_frm_str("a.miek.nl.   IN     A    127.0.0.1", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl.   IN     A    127.0.0.1", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
-       rr = ldns_rr_new_frm_str("a.miek.nl.   1D IN     A    127.0.0.1", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl.   1D IN     A    127.0.0.1", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 
-       rr = ldns_rr_new_frm_str("a.miek.nl.   1800   IN   A    195.169.222.38", 0, NULL);
+       rr = ldns_rr_new_frm_str("a.miek.nl.   1800   IN   A    195.169.222.38", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        printf("\n");
 

diff --git a/tests/run-test20.c b/tests/run-test20.c
index 8985e725d501cbd77845d6e8ea4300df22005a1b..175bd7002981d674fa0db6b15bea7e4520e98a46 100644 (file)
--- a/tests/run-test20.c
+++ b/tests/run-test20.c
@@ -55,7 +55,7 @@ main(void)
 
        ldns_key_list_push_key(keys, privkey);
 
-       rr = ldns_rr_new_frm_str("www.jelte.nlnetlabs.nl. IN A 127.0.0.1", 0, NULL);
+       rr = ldns_rr_new_frm_str("www.jelte.nlnetlabs.nl. IN A 127.0.0.1", 0, NULL, NULL);
        ldns_rr_print(stdout, rr);
        
        ldns_rr_list_push_rr(rrs, rr);