diff options
| author | ngie <ngie@FreeBSD.org> | 2016-09-18 04:34:32 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-09-18 04:34:32 +0000 |
| commit | 482bbaacb740ff8797ae90c1c9489252a115ab00 (patch) | |
| tree | 06a80b9e164642eb81beaec80d4527e173422945 /tests/sys | |
| parent | e07bfeff01c7091947812ac9c586c4a0cb9e1f73 (diff) | |
| download | FreeBSD-src-482bbaacb740ff8797ae90c1c9489252a115ab00.zip FreeBSD-src-482bbaacb740ff8797ae90c1c9489252a115ab00.tar.gz | |
MFstable/11 r305914:
MFC r305357:
Skip testcases 9/10 if jail(8) isn't installed
These testcases require jail support
Diffstat (limited to 'tests/sys')
| -rw-r--r-- | tests/sys/mac/bsdextended/matches_test.sh | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/tests/sys/mac/bsdextended/matches_test.sh b/tests/sys/mac/bsdextended/matches_test.sh index 5aff413..11cac81 100644 --- a/tests/sys/mac/bsdextended/matches_test.sh +++ b/tests/sys/mac/bsdextended/matches_test.sh @@ -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 +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 - fail $desc + # XXX: kyua is too dumb to parse skip ranges, still.. + pass "skip jail(8) not installed" + pass "skip jail(8) not installed" fi # |
