MFstable/11 r305914:

MFC r305357:

Skip testcases 9/10 if jail(8) isn't installed

These testcases require jail support
This commit is contained in:
ngie 2016-09-18 04:34:32 +00:00
parent e07bfeff01
commit 482bbaacb7

View File

@ -144,30 +144,36 @@ else
fail $desc fail $desc
fi fi
# if which jail >/dev/null; then
# Subject Match on jail #
# # Subject Match on jail
rm -f $playground/test-jail #
rm -f $playground/test-jail
desc="subject matching jailid" 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) &"` 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 ugidfw set 1 subject jailid $jailid object mode rasx
sleep 10 sleep 10
if [ -f $playground/test-jail ]; then if [ -f $playground/test-jail ]; then
fail "TODO $desc: this testcase fails (see bug # 205481)" 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 else
pass $desc # XXX: kyua is too dumb to parse skip ranges, still..
fi pass "skip jail(8) not installed"
pass "skip jail(8) not installed"
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 fi
# #