Author: ngie
Date: Sun Sep 18 04:19:43 2016
New Revision: 305914
URL: https://svnweb.freebsd.org/changeset/base/305914

Log:
  MFC r305357:
  
  Skip testcases 9/10 if jail(8) isn't installed
  
  These testcases require jail support

Modified:
  stable/11/tests/sys/mac/bsdextended/matches_test.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/tests/sys/mac/bsdextended/matches_test.sh
==============================================================================
--- stable/11/tests/sys/mac/bsdextended/matches_test.sh Sun Sep 18 03:00:46 
2016        (r305913)
+++ stable/11/tests/sys/mac/bsdextended/matches_test.sh Sun Sep 18 04:19:43 
2016        (r305914)
@@ -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
 
 #
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to