test/filters: some additional checks about testing environment

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)"
 echo "TESTING: capabilities (test/filters/caps.exp)"
 ./caps.exp
 
-echo "TESTING: protocol (test/filters/protocol.exp)"
-./protocol.exp
+if [ "$(uname -m)" = "x86_64" ]; then
+        echo "TESTING: protocol (test/filters/protocol.exp)"
+        ./protocol.exp
+else
+        echo "TESTING SKIP: protocol, not running on x86_64"
+fi
 
 echo "TESTING: seccomp bad empty (test/filters/seccomp-bad-empty.exp)"
 ./seccomp-bad-empty.exp
@@ -27,8 +31,13 @@ echo "TESTING: seccomp errno (test/filters/seccomp-errno.exp)"
 echo "TESTING: seccomp su (test/filters/seccomp-su.exp)"
 ./seccomp-su.exp
 
-echo "TESTING: seccomp ptrace (test/filters/seccomp-ptrace.exp)"
-./seccomp-ptrace.exp
+which strace
+if [ $? -eq 0 ]; then
+        echo "TESTING: seccomp ptrace (test/filters/seccomp-ptrace.exp)"
+        ./seccomp-ptrace.exp
+else
+        echo "TESTING SKIP: ptrace, strace not found"
+fi
 
 echo "TESTING: seccomp chmod - seccomp lists (test/filters/seccomp-chmod.exp)"
 ./seccomp-chmod.exp
@@ -44,7 +53,9 @@ echo "TESTING: seccomp empty (test/filters/seccomp-empty.exp)"
 echo "TESTING: seccomp bad empty (test/filters/seccomp-bad-empty.exp)"
 ./seccomp-bad-empty.exp
 
-echo "TESTING: seccomp dual filter (test/filters/seccomp-dualfilter.exp)"
-./seccomp-dualfilter.exp
-
-
+if [ "$(uname -m)" = "x86_64" ]; then
+        echo "TESTING: seccomp dual filter (test/filters/seccomp-dualfilter.exp)"
+        ./seccomp-dualfilter.exp
+else
+        echo "TESTING SKIP: seccomp dual, not running on x86_64"
+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
 
 send -- "firejail ./syscall_test32 mount\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "Child process initialized"
+        "syscall_test32: No such file or directory" {puts "\nTESTING SKIP 3: can't execute 32 bit binary\n"; exit}
 }
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "before mount"
+        "Child process initialized"
 }
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "after mount" {puts "TESTING ERROR 5.1\n";exit}
+        "before mount"
+}
+expect {
+        timeout {puts "TESTING ERROR 6\n";exit}
+        "after mount" {puts "TESTING ERROR 6.1\n";exit}
         "Parent is shutting down"
 }