From: djm@openbsd.org <djm@openbsd.org>
Date: Wed, 21 Sep 2016 17:03:54 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_4_P1~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f63ab474f58834feca4f35c498be03b7dd38a16;p=thirdparty%2Fopenssh-portable.git

upstream commit

disable tests for affirmative negated match after backout of
match change

Upstream-Regress-ID: acebb8e5042f03d66d86a50405c46c4de0badcfd
---

diff --git a/regress/unittests/match/tests.c b/regress/unittests/match/tests.c
index e6eb4af26..bcba7667c 100644
--- a/regress/unittests/match/tests.c
+++ b/regress/unittests/match/tests.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: tests.c,v 1.2 2016/08/23 08:17:04 djm Exp $ */
+/* 	$OpenBSD: tests.c,v 1.3 2016/09/21 17:03:54 djm Exp $ */
 /*
  * Regress test for matching functions
  *
@@ -57,7 +57,7 @@ tests(void)
 	ASSERT_INT_EQ(match_pattern_list("a", "*", 0), 1);
 	ASSERT_INT_EQ(match_pattern_list("a", "!*", 0), -1);
 	ASSERT_INT_EQ(match_pattern_list("a", "!a", 0), -1);
-	ASSERT_INT_EQ(match_pattern_list("a", "!b", 0), 1);
+	/* XXX negated ASSERT_INT_EQ(match_pattern_list("a", "!b", 0), 1); */
 	ASSERT_INT_EQ(match_pattern_list("a", "!a,*", 0), -1);
 	ASSERT_INT_EQ(match_pattern_list("b", "!a,*", 0), 1);
 	ASSERT_INT_EQ(match_pattern_list("a", "*,!a", 0), -1);
@@ -65,7 +65,7 @@ tests(void)
 	ASSERT_INT_EQ(match_pattern_list("a", "a,!*", 0), -1);
 	ASSERT_INT_EQ(match_pattern_list("b", "a,!*", 0), -1);
 	ASSERT_INT_EQ(match_pattern_list("a", "a,!a", 0), -1);
-	ASSERT_INT_EQ(match_pattern_list("b", "a,!a", 0), 1);
+	/* XXX negated ASSERT_INT_EQ(match_pattern_list("b", "a,!a", 0), 1); */
 	ASSERT_INT_EQ(match_pattern_list("a", "!*,a", 0), -1);
 	ASSERT_INT_EQ(match_pattern_list("b", "!*,a", 0), -1);
 	TEST_DONE();
@@ -86,19 +86,19 @@ tests(void)
 	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "127.0.0.1"), 1);
 	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "127.0.0.2"), 0);
 	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "!127.0.0.1"), -1);
-	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "!127.0.0.2"), 1);
+	/* XXX negated ASSERT_INT_EQ(addr_match_list("127.0.0.1", "!127.0.0.2"), 1); */
 	ASSERT_INT_EQ(addr_match_list("127.0.0.255", "127.0.0.0/24"), 1);
 	ASSERT_INT_EQ(addr_match_list("127.0.1.1", "127.0.0.0/24"), 0);
 	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "127.0.0.0/24"), 1);
 	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "127.0.1.0/24"), 0);
 	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "!127.0.0.0/24"), -1);
-	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "!127.0.1.0/24"), 1);
+	/* XXX negated ASSERT_INT_EQ(addr_match_list("127.0.0.1", "!127.0.1.0/24"), 1); */
 	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "10.0.0.1,!127.0.0.1"), -1);
 	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "!127.0.0.1,10.0.0.1"), -1);
 	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "10.0.0.1,127.0.0.2"), 0);
 	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "127.0.0.2,10.0.0.1"), 0);
-	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "10.0.0.1,!127.0.0.2"), 1);
-	ASSERT_INT_EQ(addr_match_list("127.0.0.1", "!127.0.0.2,10.0.0.1"), 1);
+	/* XXX negated ASSERT_INT_EQ(addr_match_list("127.0.0.1", "10.0.0.1,!127.0.0.2"), 1); */
+	/* XXX negated ASSERT_INT_EQ(addr_match_list("127.0.0.1", "!127.0.0.2,10.0.0.1"), 1); */
 	TEST_DONE();
 
 /*