diff --git a/.gitignore b/.gitignore index 744349f941d1fb61186db87915cf42cbdc2ac134..fe7ad126729e2bb54fb38adad4e42344ca5bf2c3 100644 --- a/.gitignore +++ b/.gitignore @@ -92,4 +92,3 @@ *.gcno /coverage.info /coverage.html - diff --git a/tests/semcheck/Makefile.inc b/tests/semcheck/Makefile.inc index beab2ef9d767cb0c6082b2d587f17d221d8b39cf..5ed2a7987795daf0cc357153861ff2c401433a19 100644 --- a/tests/semcheck/Makefile.inc +++ b/tests/semcheck/Makefile.inc @@ -11,8 +11,6 @@ semantic_check: $(top_srcdir)/tests/semcheck/test.in $(edit) < $(top_srcdir)/tests/semcheck/test.in > $(top_builddir)/tests/semantic_check chmod +x $(top_builddir)/tests/semantic_check - EXTRA_DIST = \ semcheck/test.in \ semcheck - diff --git a/tests/semcheck/cname_extra_01.zone b/tests/semcheck/cname_extra_01.zone index 405887f72e22c976298d81ea856cf641d9831d40..ae3f27a386d37624bb97588e61f015aa4baaab71 100644 --- a/tests/semcheck/cname_extra_01.zone +++ b/tests/semcheck/cname_extra_01.zone @@ -16,6 +16,3 @@ dns1 A 192.0.2.1 ; error CNAME, node contains other records email CNAME mail A 192.0.2.2 - - - diff --git a/tests/semcheck/cname_extra_02.signed b/tests/semcheck/cname_extra_02.signed index 5c675c68ad4bc96ae8c563826fd85d295243a398..724a8da315b60054b0bd3bbd16ea9fb198a9804c 100644 --- a/tests/semcheck/cname_extra_02.signed +++ b/tests/semcheck/cname_extra_02.signed @@ -74,4 +74,3 @@ dns1.example.com. 3600 IN A 192.0.2.1 BFz1Z7dbBNgHXDOaufuCoIzGHbwyLUrA+Wad QBPD9xCYkXHoHfvVOhtEeMR19Rz+fi6ottJI 4AWItiobBC/DAQ== ) - diff --git a/tests/semcheck/cname_multiple.zone b/tests/semcheck/cname_multiple.zone index 92b666c1744aed3bfdd01a8c0b7163f64f7a0b17..971c34f1e960f0ba9ff64519f9ff7553b95204d0 100644 --- a/tests/semcheck/cname_multiple.zone +++ b/tests/semcheck/cname_multiple.zone @@ -13,4 +13,3 @@ dns1 A 192.0.2.1 email CNAME mail email CNAME mail2 - diff --git a/tests/semcheck/different_signer_name.signed b/tests/semcheck/different_signer_name.signed index 577aab14f5c08ea1bd3d369f8ba9aadbc983e9f2..60a7f08a8b21dafec94f4cedc9d2b1e12c2682cc 100644 --- a/tests/semcheck/different_signer_name.signed +++ b/tests/semcheck/different_signer_name.signed @@ -56,4 +56,3 @@ example.com. 3600 IN SOA dns1.example.com. hostmaster.example.com. ( nvruQZ5cZZ9+/I6wAh5AjWlxomueuuFiFoZe XYBFmB+VH+eWpWL2Lp4hgaQ6UyKaHAKqtzMC pqVA7Vwz4HEftQ== ) - diff --git a/tests/semcheck/dname_children.zone b/tests/semcheck/dname_children.zone index 4ddafe7593f6b8cbc224e6cf89af46249fd05261..57588337bd08263f4a2d3cb0508770e8f1836a88 100644 --- a/tests/semcheck/dname_children.zone +++ b/tests/semcheck/dname_children.zone @@ -14,4 +14,3 @@ dns1 A 192.0.2.1 foo DNAME bar bar.foo A 192.0.0.1 - diff --git a/tests/semcheck/missing_glue_03.zone b/tests/semcheck/missing_glue_03.zone index 5ba3ee17daec9ff0813320e07e45f97278612e89..4485d439dd6124f806e7d32f55274bef044fecaa 100644 --- a/tests/semcheck/missing_glue_03.zone +++ b/tests/semcheck/missing_glue_03.zone @@ -13,4 +13,3 @@ dns1 A 192.0.2.1 deleg NS ns1.deleg ; missing A record for ns1.deleg - diff --git a/tests/semcheck/no_rrsig.signed b/tests/semcheck/no_rrsig.signed index 39919bf565ab4e0183c4e5c963e1b99bf91e74ba..6a3161b2cc027f0c78b4970f5daa8ed6e56f4a6a 100644 --- a/tests/semcheck/no_rrsig.signed +++ b/tests/semcheck/no_rrsig.signed @@ -46,4 +46,3 @@ example.com. 3600 IN SOA dns1.example.com. hostmaster.example.com. ( EQMX5DPXhwa+blMRkzl+swUW3BtzpGJ5tGEU hkH7bJfM51gIAO5qnUO/mMPnEA8b4dc20nnZ 8j8lETDjqBLgDQ== ) - diff --git a/tests/semcheck/nsec3_chain_02.signed b/tests/semcheck/nsec3_chain_02.signed index 3ecb96e3b64efb64ba9929440e61a4c6577d0eac..ca70cfa2fe19196f7f77b6d58c164b38d83cdbc9 100644 --- a/tests/semcheck/nsec3_chain_02.signed +++ b/tests/semcheck/nsec3_chain_02.signed @@ -1,4 +1,3 @@ - 20G1GOL477RO51RK9A9NFD54TFQAL7IQ.example.com. 86400 IN NSEC3 1 0 10 - ( 6DFJITU5VML86QNKU9FO2LJDDQQTQPVT A RRSIG ) @@ -93,5 +92,3 @@ www.example.com. 3600 IN A 192.0.2.1 NWFuYaSEg3z3K4l/fHu/X9dK+rDZ177BbCNN ZeFTPCAdOnX0nw1CQys629k7Vzdv1pHaanmy 0Ru0tX9R65NlKw== ) - - diff --git a/tests/semcheck/nsec3_chain_03.signed b/tests/semcheck/nsec3_chain_03.signed index f666bfa99883621a1dee97481551de1292388cfd..80112f81cc76e044c2a1d750f8b337136902e51d 100644 --- a/tests/semcheck/nsec3_chain_03.signed +++ b/tests/semcheck/nsec3_chain_03.signed @@ -92,5 +92,3 @@ www.example.com. 3600 IN A 192.0.2.1 NWFuYaSEg3z3K4l/fHu/X9dK+rDZ177BbCNN ZeFTPCAdOnX0nw1CQys629k7Vzdv1pHaanmy 0Ru0tX9R65NlKw== ) - - diff --git a/tests/semcheck/nsec3_wrong_bitmap_01.signed b/tests/semcheck/nsec3_wrong_bitmap_01.signed index fba41e99b107fe8593e15e2ae6f5e703a1258b98..a3024d8d84e45313e9b091da19d9a3c575294c4f 100644 --- a/tests/semcheck/nsec3_wrong_bitmap_01.signed +++ b/tests/semcheck/nsec3_wrong_bitmap_01.signed @@ -68,4 +68,3 @@ UTQVUHU2BLK3DHMRR5T1HD9VTEOHQT0A.example.com. 86400 RRSIG NSEC3 7 3 86400 ( m2z+hx+8hTA7Phu6QzGJrq+o4MiURpda3fYm 0wTDmXtfPKsHmojGr3kBlvUMg16s2gpvNyCL MSlnJ+7KCkI+Mw== ) - diff --git a/tests/semcheck/nsec3_wrong_bitmap_02.signed b/tests/semcheck/nsec3_wrong_bitmap_02.signed index 84455ee1f27927b35b4917065174f9b91c94dd4d..e3e494048e1e7035e0d9da5b4420ea5bce042870 100644 --- a/tests/semcheck/nsec3_wrong_bitmap_02.signed +++ b/tests/semcheck/nsec3_wrong_bitmap_02.signed @@ -68,4 +68,3 @@ UTQVUHU2BLK3DHMRR5T1HD9VTEOHQT0A.example.com. 86400 RRSIG NSEC3 7 3 86400 ( m2z+hx+8hTA7Phu6QzGJrq+o4MiURpda3fYm 0wTDmXtfPKsHmojGr3kBlvUMg16s2gpvNyCL MSlnJ+7KCkI+Mw== ) - diff --git a/tests/semcheck/nsec_broken_chain_01.signed b/tests/semcheck/nsec_broken_chain_01.signed index fd469ef5e605fecf49b67789b7e34d92cba18896..cb41dced58c75d0520256c867c98c940a3889435 100644 --- a/tests/semcheck/nsec_broken_chain_01.signed +++ b/tests/semcheck/nsec_broken_chain_01.signed @@ -70,4 +70,3 @@ www.example.com. 3600 IN A 192.0.2.2 FLR8e2k6u7dhQA1xZ3YMxkvuktoydXC+ZNwl xzW9hLpF3oKoqqY/V+kw7m2OMgnOEu2jWN4Q EETdmMeQzkiuNw== ) - diff --git a/tests/semcheck/nsec_broken_chain_02.signed b/tests/semcheck/nsec_broken_chain_02.signed index d4413aa710043421e1997dbe77de228ee368d8d2..27d8ebb8a3e7c072a8246c51dbba8c878522cd5f 100644 --- a/tests/semcheck/nsec_broken_chain_02.signed +++ b/tests/semcheck/nsec_broken_chain_02.signed @@ -71,4 +71,3 @@ www.example.com. 3600 IN A 192.0.2.2 FLR8e2k6u7dhQA1xZ3YMxkvuktoydXC+ZNwl xzW9hLpF3oKoqqY/V+kw7m2OMgnOEu2jWN4Q EETdmMeQzkiuNw== ) - diff --git a/tests/semcheck/nsec_missing.signed b/tests/semcheck/nsec_missing.signed index 5756b8a1bc3472de0ddc05707c4edfcbe3f5402c..e9016078f4dc6650794f77b5233a6e4d10207388 100644 --- a/tests/semcheck/nsec_missing.signed +++ b/tests/semcheck/nsec_missing.signed @@ -65,4 +65,3 @@ www.example.com. 3600 IN A 192.0.2.2 FLR8e2k6u7dhQA1xZ3YMxkvuktoydXC+ZNwl xzW9hLpF3oKoqqY/V+kw7m2OMgnOEu2jWN4Q EETdmMeQzkiuNw== ) - diff --git a/tests/semcheck/nsec_multiple.signed b/tests/semcheck/nsec_multiple.signed index 1b955536dfd24b11165b7dd6296d3b35aa23ef75..fc8e41b0b24e761bd09693a974970d6abfaf5853 100644 --- a/tests/semcheck/nsec_multiple.signed +++ b/tests/semcheck/nsec_multiple.signed @@ -72,4 +72,3 @@ www.example.com. 3600 IN A 192.0.2.2 FLR8e2k6u7dhQA1xZ3YMxkvuktoydXC+ZNwl xzW9hLpF3oKoqqY/V+kw7m2OMgnOEu2jWN4Q EETdmMeQzkiuNw== ) - diff --git a/tests/semcheck/nsec_wrong_bitmap_01.signed b/tests/semcheck/nsec_wrong_bitmap_01.signed index 4476c6303f1d3822b46e197b482551e570fa713f..058a0a3512e7aeec4b276455d4798f62d8ebb2c0 100644 --- a/tests/semcheck/nsec_wrong_bitmap_01.signed +++ b/tests/semcheck/nsec_wrong_bitmap_01.signed @@ -71,6 +71,3 @@ dns1.example.com. 3600 IN A 192.0.2.1 HlfZThngg+1xglDUh8kjDtzVn5D5a9T3emMt Uxfryu9va7bj+xoK4gLADGau69GCZxJNSvwK TAGEqGRYFSY9Ew== ) - - - diff --git a/tests/semcheck/nsec_wrong_bitmap_02.signed b/tests/semcheck/nsec_wrong_bitmap_02.signed index f943acb43f397f44dd2ae1db0f1df3450dff63a7..dafdc9204f779d4562d95bdc8b38c1808ef45db1 100644 --- a/tests/semcheck/nsec_wrong_bitmap_02.signed +++ b/tests/semcheck/nsec_wrong_bitmap_02.signed @@ -71,6 +71,3 @@ dns1.example.com. 3600 IN A 192.0.2.1 HlfZThngg+1xglDUh8kjDtzVn5D5a9T3emMt Uxfryu9va7bj+xoK4gLADGau69GCZxJNSvwK TAGEqGRYFSY9Ew== ) - - - diff --git a/tests/semcheck/rrsig_rdata_ttl.signed b/tests/semcheck/rrsig_rdata_ttl.signed index 1eb2ba6e464e18b4b21766ea562aa03fffdcdbcb..b626b459e32ab7d6215eaff4b513c76e435cc822 100644 --- a/tests/semcheck/rrsig_rdata_ttl.signed +++ b/tests/semcheck/rrsig_rdata_ttl.signed @@ -1,4 +1,3 @@ - dns1.example.com. 3600 IN A 192.0.2.1 3600 RRSIG A 7 3 600 ( 20840201000000 20160201000000 29600 example.com. @@ -57,4 +56,3 @@ example.com. 3600 IN SOA dns1.example.com. hostmaster.example.com. ( cZTevjvA8UO9Tqet/pbsN0Peep6aN8heyxMK XP/Twsj4u0DeClKeIN7pd7Gi7Aac/UV2dev/ x/90SM22VQVpeQ== ) - diff --git a/tests/semcheck/rrsig_ttl.signed b/tests/semcheck/rrsig_ttl.signed index 185cd1cc6d294d304d94f4e5f17db84522d5389e..04be771cf9681a3ac3f0f1f1b80c4ca8a94c64f1 100644 --- a/tests/semcheck/rrsig_ttl.signed +++ b/tests/semcheck/rrsig_ttl.signed @@ -1,4 +1,3 @@ - dns1.example.com. 3600 IN A 192.0.2.1 600 RRSIG A 7 3 3600 ( 20840201000000 20160201000000 29600 example.com. @@ -57,4 +56,3 @@ example.com. 3600 IN SOA dns1.example.com. hostmaster.example.com. ( cZTevjvA8UO9Tqet/pbsN0Peep6aN8heyxMK XP/Twsj4u0DeClKeIN7pd7Gi7Aac/UV2dev/ x/90SM22VQVpeQ== ) - diff --git a/tests/semcheck/test.in b/tests/semcheck/test.in index b52f231ee24c000a5c6b697f3d7f410976b8fa8c..4486bf14d3c19b204ca36782b8b3418fae726c7b 100644 --- a/tests/semcheck/test.in +++ b/tests/semcheck/test.in @@ -18,7 +18,7 @@ expect_error() ret=$? if [ $2 -eq 1 ]; then ok "$1 - program return code" test $ret -eq 1 - else + else ok "$1 - program return code" test $ret -eq 2 fi @@ -26,7 +26,7 @@ expect_error() ok "$1 - check fatal" test $? -ne $2 grep "node: .* (${4}.*" $LOG > /dev/null ok "$1 - check message" test $? -eq 0 - + errors=$(grep "node:" $LOG | wc -l) ok "number of found errors" test $errors -eq $3 if [ $errors != $3 ]; then @@ -80,4 +80,3 @@ test_correct "no_error_delegaton_bitmap.signed" test_correct "no_error_nsec3_delegation.signed" rm $LOG -