diff options
author | Reiner Herrmann <reiner@reiner-h.de> | 2016-04-30 21:00:04 +0200 |
---|---|---|
committer | Reiner Herrmann <reiner@reiner-h.de> | 2016-04-30 21:00:04 +0200 |
commit | c1b25cefcc009dc9445342f486fa03c8757a5f74 (patch) | |
tree | 1a1e593ae0fa81f25615d7926e839773ae1a8cf9 | |
parent | make test-filters fixes (diff) | |
download | firejail-c1b25cefcc009dc9445342f486fa03c8757a5f74.tar.gz firejail-c1b25cefcc009dc9445342f486fa03c8757a5f74.tar.zst firejail-c1b25cefcc009dc9445342f486fa03c8757a5f74.zip |
test/filters: some additional checks about testing environment
-rwxr-xr-x | test/filters/filters.sh | 27 | ||||
-rwxr-xr-x | test/filters/seccomp-dualfilter.exp | 11 |
2 files changed, 26 insertions, 12 deletions
diff --git a/test/filters/filters.sh b/test/filters/filters.sh index 1e64a6373..67b9f2c0d 100755 --- a/test/filters/filters.sh +++ b/test/filters/filters.sh | |||
@@ -12,8 +12,12 @@ echo "TESTING: noroot (test/filters/noroot.exp)" | |||
12 | echo "TESTING: capabilities (test/filters/caps.exp)" | 12 | echo "TESTING: capabilities (test/filters/caps.exp)" |
13 | ./caps.exp | 13 | ./caps.exp |
14 | 14 | ||
15 | echo "TESTING: protocol (test/filters/protocol.exp)" | 15 | if [ "$(uname -m)" = "x86_64" ]; then |
16 | ./protocol.exp | 16 | echo "TESTING: protocol (test/filters/protocol.exp)" |
17 | ./protocol.exp | ||
18 | else | ||
19 | echo "TESTING SKIP: protocol, not running on x86_64" | ||
20 | fi | ||
17 | 21 | ||
18 | echo "TESTING: seccomp bad empty (test/filters/seccomp-bad-empty.exp)" | 22 | echo "TESTING: seccomp bad empty (test/filters/seccomp-bad-empty.exp)" |
19 | ./seccomp-bad-empty.exp | 23 | ./seccomp-bad-empty.exp |
@@ -27,8 +31,13 @@ echo "TESTING: seccomp errno (test/filters/seccomp-errno.exp)" | |||
27 | echo "TESTING: seccomp su (test/filters/seccomp-su.exp)" | 31 | echo "TESTING: seccomp su (test/filters/seccomp-su.exp)" |
28 | ./seccomp-su.exp | 32 | ./seccomp-su.exp |
29 | 33 | ||
30 | echo "TESTING: seccomp ptrace (test/filters/seccomp-ptrace.exp)" | 34 | which strace |
31 | ./seccomp-ptrace.exp | 35 | if [ $? -eq 0 ]; then |
36 | echo "TESTING: seccomp ptrace (test/filters/seccomp-ptrace.exp)" | ||
37 | ./seccomp-ptrace.exp | ||
38 | else | ||
39 | echo "TESTING SKIP: ptrace, strace not found" | ||
40 | fi | ||
32 | 41 | ||
33 | echo "TESTING: seccomp chmod - seccomp lists (test/filters/seccomp-chmod.exp)" | 42 | echo "TESTING: seccomp chmod - seccomp lists (test/filters/seccomp-chmod.exp)" |
34 | ./seccomp-chmod.exp | 43 | ./seccomp-chmod.exp |
@@ -44,7 +53,9 @@ echo "TESTING: seccomp empty (test/filters/seccomp-empty.exp)" | |||
44 | echo "TESTING: seccomp bad empty (test/filters/seccomp-bad-empty.exp)" | 53 | echo "TESTING: seccomp bad empty (test/filters/seccomp-bad-empty.exp)" |
45 | ./seccomp-bad-empty.exp | 54 | ./seccomp-bad-empty.exp |
46 | 55 | ||
47 | echo "TESTING: seccomp dual filter (test/filters/seccomp-dualfilter.exp)" | 56 | if [ "$(uname -m)" = "x86_64" ]; then |
48 | ./seccomp-dualfilter.exp | 57 | echo "TESTING: seccomp dual filter (test/filters/seccomp-dualfilter.exp)" |
49 | 58 | ./seccomp-dualfilter.exp | |
50 | 59 | else | |
60 | echo "TESTING SKIP: seccomp dual, not running on x86_64" | ||
61 | fi | ||
diff --git a/test/filters/seccomp-dualfilter.exp b/test/filters/seccomp-dualfilter.exp index 26b36236a..7c964d5c3 100755 --- a/test/filters/seccomp-dualfilter.exp +++ b/test/filters/seccomp-dualfilter.exp | |||
@@ -25,16 +25,19 @@ sleep 1 | |||
25 | 25 | ||
26 | send -- "firejail ./syscall_test32 mount\r" | 26 | send -- "firejail ./syscall_test32 mount\r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 3\n";exit} | 28 | "syscall_test32: No such file or directory" {puts "\nTESTING SKIP 3: can't execute 32 bit binary\n"; exit} |
29 | "Child process initialized" | ||
30 | } | 29 | } |
31 | expect { | 30 | expect { |
32 | timeout {puts "TESTING ERROR 4\n";exit} | 31 | timeout {puts "TESTING ERROR 4\n";exit} |
33 | "before mount" | 32 | "Child process initialized" |
34 | } | 33 | } |
35 | expect { | 34 | expect { |
36 | timeout {puts "TESTING ERROR 5\n";exit} | 35 | timeout {puts "TESTING ERROR 5\n";exit} |
37 | "after mount" {puts "TESTING ERROR 5.1\n";exit} | 36 | "before mount" |
37 | } | ||
38 | expect { | ||
39 | timeout {puts "TESTING ERROR 6\n";exit} | ||
40 | "after mount" {puts "TESTING ERROR 6.1\n";exit} | ||
38 | "Parent is shutting down" | 41 | "Parent is shutting down" |
39 | } | 42 | } |
40 | 43 | ||