From 75b9becc2cc729501ca68cf96db7e6e557d2883e Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@FreeBSD.org>
Date: Sun, 22 Jul 2018 21:00:11 +0000
Subject: [PATCH] Temporarily disable the sys/acl/00 and sys/acl/02 tests

These tests are failing due to PR 229930.  Unfortunately, TAP tests can't be
marked as expected failures.

PR:		229930
Reported by:	Jenkins
---
 tests/sys/acl/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/sys/acl/Makefile b/tests/sys/acl/Makefile
index bd548f06951e..4a34b4d7f7ca 100644
--- a/tests/sys/acl/Makefile
+++ b/tests/sys/acl/Makefile
@@ -14,9 +14,11 @@ ${PACKAGE}FILES+=	tools-posix.test
 
 SCRIPTS+=	run
 
-TAP_TESTS_SH+=	00
+# Disable 00 and 02 until they've been updated for setfacl's new behavior
+# PR 229930 tests/sys/acl/00:main fails in CI due to unexpected error message
+# TAP_TESTS_SH+=	00
+# TAP_TESTS_SH+=	02
 TAP_TESTS_SH+=	01
-TAP_TESTS_SH+=	02
 TAP_TESTS_SH+=	03
 TAP_TESTS_SH+=	04
 
@@ -30,8 +32,8 @@ _ACL_PROGS=		getfacl setfacl
 TEST_METADATA.$t+=	required_programs="perl zpool ${_ACL_PROGS}"
 .endfor
 
-.for t in 00 02
-TEST_METADATA.$t+=	required_programs="perl ${_ACL_PROGS}"
-.endfor
+# .for t in 00 02
+# TEST_METADATA.$t+=	required_programs="perl ${_ACL_PROGS}"
+# .endfor
 
 .include <bsd.test.mk>