From 4cd67304c582782a83fa24803f28d7f641ed2201 Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Fri, 28 Apr 2000 16:30:55 +0000 Subject: [PATCH] dns_name_fullcompare/compare contract change --- bin/tests/names/t_names.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c index 8fe2fb259a..32afdd2876 100644 --- a/bin/tests/names/t_names.c +++ b/bin/tests/names/t_names.c @@ -967,6 +967,13 @@ test_dns_name_fullcompare(char *name1, char *name2, dns_namereln_t exp_dns_reln, dns_namereln_to_text(exp_dns_reln), dns_namereln_to_text(dns_reln)); } + /* + * Normalize order. + */ + if (order < 0) + order = -1; + else if (order > 0) + order = 1; if (order != exp_order) { ++nfails; t_info("expected ordering %d, got %d\n", @@ -1094,7 +1101,13 @@ test_dns_name_compare(char *name1, char *name2, int exp_order) { dns_result = dname_from_tname(name2, &dns_name2); if (dns_result == ISC_R_SUCCESS) { order = dns_name_compare(&dns_name1, &dns_name2); - + /* + * Normalize order. + */ + if (order < 0) + order = -1; + else if (order > 0) + order = 1; if (order != exp_order) { t_info("expected order of %d, got %d\n", exp_order, order); @@ -1192,7 +1205,13 @@ test_dns_name_rdatacompare(char *name1, char *name2, int exp_order) { dns_result = dname_from_tname(name2, &dns_name2); if (dns_result == ISC_R_SUCCESS) { order = dns_name_rdatacompare(&dns_name1, &dns_name2); - + /* + * Normalize order. + */ + if (order < 0) + order = -1; + else if (order > 0) + order = 1; if (order != exp_order) { t_info("expected order of %d, got %d\n", exp_order, order);