svn commit: r305357 - head/tests/sys/mac/bsdextended

[Ngie Cooper]

Author: ngie
Date: Sat Sep  3 17:59:46 2016
New Revision: 305357
URL: https://svnweb.freebsd.org/changeset/base/305357

Log:
  Skip testcases 9/10 if jail(8) isn't installed
  
  These testcases require jail support
  
  MFC after:	1 week
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/tests/sys/mac/bsdextended/matches_test.sh

Modified: head/tests/sys/mac/bsdextended/matches_test.sh
==============================================================================
--- head/tests/sys/mac/bsdextended/matches_test.sh	Sat Sep  3 17:31:13 2016	(r305356)
+++ head/tests/sys/mac/bsdextended/matches_test.sh	Sat Sep  3 17:59:46 2016	(r305357)
@@ -144,30 +144,36 @@ else
 	fail $desc
 fi
 
-#
-# Subject Match on jail
-#
-rm -f $playground/test-jail
-
-desc="subject matching jailid"
-jailid=`jail -i / localhost 127.0.0.1 /usr/sbin/daemon -f /bin/sh -c "(sleep 5; touch $playground/test-jail) &"`
-ugidfw set 1 subject jailid $jailid object mode rasx
-sleep 10
-
-if [ -f $playground/test-jail ]; then
-	fail "TODO $desc: this testcase fails (see bug # 205481)"
-else
-	pass $desc
-fi
-
-rm -f $playground/test-jail
-desc="subject nonmatching jailid"
-jailid=`jail -i / localhost 127.0.0.1 /usr/sbin/daemon -f /bin/sh -c "(sleep 5; touch $playground/test-jail) &"`
-sleep 10
-if [ -f $playground/test-jail ]; then
-	pass $desc
-else
-	fail $desc
+if which jail >/dev/null; then
+	#
+	# Subject Match on jail
+	#
+	rm -f $playground/test-jail
+
+	desc="subject matching jailid"
+	jailid=`jail -i / localhost 127.0.0.1 /usr/sbin/daemon -f /bin/sh -c "(sleep 5; touch $playground/test-jail) &"`
+	ugidfw set 1 subject jailid $jailid object mode rasx
+	sleep 10
+
+	if [ -f $playground/test-jail ]; then
+		fail "TODO $desc: this testcase fails (see bug # 205481)"
+	else
+		pass $desc
+	fi
+
+	rm -f $playground/test-jail
+	desc="subject nonmatching jailid"
+	jailid=`jail -i / localhost 127.0.0.1 /usr/sbin/daemon -f /bin/sh -c "(sleep 5; touch $playground/test-jail) &"`
+	sleep 10
+	if [ -f $playground/test-jail ]; then
+		pass $desc
+	else
+		fail $desc
+	fi
+else
+	# XXX: kyua is too dumb to parse skip ranges, still..
+	pass "skip jail(8) not installed"
+	pass "skip jail(8) not installed"
 fi
 
 #