From a4bf005bfa5dbf58f84185dc6f2527f6465bd210 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 7 Dec 2006 13:25:58 +0000 Subject: [PATCH] remove DNS_R_TOOMANYHOPS test --- bin/tests/names/dns_name_fromwire_8_data | 4 ++-- bin/tests/names/dns_name_fromwire_9_data | 30 ------------------------ bin/tests/names/t_names.c | 13 +++------- bin/tests/names/wire_test9.data | 13 ---------- 4 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 bin/tests/names/dns_name_fromwire_9_data delete mode 100644 bin/tests/names/wire_test9.data diff --git a/bin/tests/names/dns_name_fromwire_8_data b/bin/tests/names/dns_name_fromwire_8_data index 744da071c01..9ddd3f3da06 100644 --- a/bin/tests/names/dns_name_fromwire_8_data +++ b/bin/tests/names/dns_name_fromwire_8_data @@ -1,5 +1,5 @@ # -# test data for dns_name_fromwire_8 +# test data for dns_name_fromwire_9 # format: # # @@ -27,4 +27,4 @@ # ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS # -wire_test8.data 383 1 DNS_COMPRESS_ALL vix.com. DNS_R_TOOMANYHOPS +wire_test8.data 25 1 DNS_COMPRESS_ALL vix.com. ISC_R_NOSPACE diff --git a/bin/tests/names/dns_name_fromwire_9_data b/bin/tests/names/dns_name_fromwire_9_data deleted file mode 100644 index 47c8a068aee..00000000000 --- a/bin/tests/names/dns_name_fromwire_9_data +++ /dev/null @@ -1,30 +0,0 @@ -# -# test data for dns_name_fromwire_9 -# format: -# -# -# -# where msgfile contains a DNS message in hex form -# -# and where testname_offset is the byte offset in this message of -# the start of a name -# -# and where downcase is 1 or 0 -# -# and where dc_method is one of -# DNS_COMPRESS_ALL -# DNS_COMPRESS_GLOBAL14 -# DNS_COMPRESS_NONE -# -# and where exp_name is the expected name after any decompression -# or case conversion -# -# and where exp_result may be one of -# ISC_R_NOSPACE -# DNS_R_BADLABELTYPE -# DNS_R_DISALLOWED -# DNS_R_BADPOINTER -# ISC_R_UNEXPECTEDEND -# DNS_R_TOOMANYHOPS -# -wire_test9.data 25 1 DNS_COMPRESS_ALL vix.com. ISC_R_NOSPACE diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c index c9f2f15ac8d..d0ae0a9db38 100644 --- a/bin/tests/names/t_names.c +++ b/bin/tests/names/t_names.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_names.c,v 1.32.2.5 2006/01/04 23:50:17 marka Exp $ */ +/* $Id: t_names.c,v 1.32.2.6 2006/12/07 13:25:58 marka Exp $ */ #include @@ -2139,10 +2139,6 @@ static const char *a48 = "returns ISC_R_UNEXPECTEDEND"; static const char *a49 = - "when there are too many compression pointers, " - "dns_name_fromwire() returns DNS_R_TOOMANYHOPS"; - -static const char *a50 = "when there is not enough space in target, " "dns_name_fromwire(name, source, dcts, downcase, target) " "returns ISC_R_NOSPACE"; @@ -2327,11 +2323,8 @@ t_dns_name_fromwire(void) { t_assert("dns_name_fromwire", 7, T_REQUIRED, a48); t_dns_name_fromwire_x("dns_name_fromwire_7_data", BUFLEN); - t_assert("dns_name_fromwire", 8, T_REQUIRED, a49); - t_dns_name_fromwire_x("dns_name_fromwire_8_data", BUFLEN); - - t_assert("dns_name_fromwire", 9, T_REQUIRED, a50); - t_dns_name_fromwire_x("dns_name_fromwire_9_data", 2); + t_assert("dns_name_fromwire", 9, T_REQUIRED, a49); + t_dns_name_fromwire_x("dns_name_fromwire_8_data", 2); } diff --git a/bin/tests/names/wire_test9.data b/bin/tests/names/wire_test9.data deleted file mode 100644 index 505134acfa9..00000000000 --- a/bin/tests/names/wire_test9.data +++ /dev/null @@ -1,13 +0,0 @@ -# -# a global14 compression pointer -# -000a85800001000300000003 -0376697803636f6d0000020001c00c00 -02000100000e10000b05697372763102 -7061c00cc00c0002000100000e100009 -066e732d657874c00cc00c0002000100 -000e10000e036e733104676e61630363 -6f6d00c0250001000100000e100004cc -98b886c03c0001000100000e100004cc -98b840c051000100010002a14a0004c6 -97f8f6 -- 2.47.3