diff options
author | Reiner Herrmann <reiner@reiner-h.de> | 2018-09-21 18:45:10 +0200 |
---|---|---|
committer | Reiner Herrmann <reiner@reiner-h.de> | 2018-09-21 18:45:10 +0200 |
commit | 8b9844e4f1ee4b26fcbc64f73e4e621f6ff0e63f (patch) | |
tree | 409a0aa2d208211b027a9029dfc002c1e640408d /test/filters | |
parent | tests: skip tests checking for /dev/kmsg which might not be available (diff) | |
download | firejail-8b9844e4f1ee4b26fcbc64f73e4e621f6ff0e63f.tar.gz firejail-8b9844e4f1ee4b26fcbc64f73e4e621f6ff0e63f.tar.zst firejail-8b9844e4f1ee4b26fcbc64f73e4e621f6ff0e63f.zip |
tests: skip more tests if capabilities/seccomp of host differs
Diffstat (limited to 'test/filters')
-rwxr-xr-x | test/filters/filters.sh | 9 | ||||
-rwxr-xr-x | test/filters/noroot.exp | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test/filters/filters.sh b/test/filters/filters.sh index d0a34ccc5..72d699415 100755 --- a/test/filters/filters.sh +++ b/test/filters/filters.sh | |||
@@ -35,8 +35,13 @@ echo "TESTING: seccomp postexec (test/filters/seccomp-postexec.exp)" | |||
35 | echo "TESTING: noroot (test/filters/noroot.exp)" | 35 | echo "TESTING: noroot (test/filters/noroot.exp)" |
36 | ./noroot.exp | 36 | ./noroot.exp |
37 | 37 | ||
38 | echo "TESTING: capabilities (test/filters/caps.exp)" | 38 | |
39 | ./caps.exp | 39 | if grep -q "^CapBnd:\\s0000003fffffffff" /proc/self/status; then |
40 | echo "TESTING: capabilities (test/filters/caps.exp)" | ||
41 | ./caps.exp | ||
42 | else | ||
43 | echo "TESTING SKIP: other capabilities than expected (test/filters/caps.exp)" | ||
44 | fi | ||
40 | 45 | ||
41 | echo "TESTING: capabilities print (test/filters/caps-print.exp)" | 46 | echo "TESTING: capabilities print (test/filters/caps-print.exp)" |
42 | ./caps-print.exp | 47 | ./caps-print.exp |
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp index ba52a903a..dee0416c1 100755 --- a/test/filters/noroot.exp +++ b/test/filters/noroot.exp | |||
@@ -91,6 +91,7 @@ expect { | |||
91 | } | 91 | } |
92 | expect { | 92 | expect { |
93 | timeout {puts "TESTING ERROR 14\n";exit} | 93 | timeout {puts "TESTING ERROR 14\n";exit} |
94 | "2" {puts "seccomp already active\n";} | ||
94 | "0" | 95 | "0" |
95 | } | 96 | } |
96 | expect { | 97 | expect { |