1 files changed, 38 insertions, 39 deletions

diff --git a/test/filters/filters.sh b/test/filters/filters.sh
index 04d7080d6..3b4a6b492 100755
--- a/test/filters/filters.sh
+++ b/test/filters/filters.sh
@@ -7,37 +7,37 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
 
-if [ -f /etc/debian_version ]; then
+if [[ -f /etc/debian_version ]]; then
         libdir=$(dirname "$(dpkg -L firejail | grep fseccomp)")
         export PATH="$PATH:$libdir"
 fi
 export PATH="$PATH:/usr/lib/firejail:/usr/lib64/firejail"
 
-if [ -f /sys/kernel/security/apparmor/profiles ]; then
+if [[ -f /sys/kernel/security/apparmor/profiles ]]; then
         echo "TESTING: apparmor (test/filters/apparmor.exp)"
         ./apparmor.exp
 else
         echo "TESTING SKIP: no apparmor support in Linux kernel (test/filters/apparmor.exp)"
 fi
 
-if [ "$(uname -m)" = "x86_64" ]; then
-    echo "TESTING: memory-deny-write-execute (test/filters/memwrexe.exp)"
-    ./memwrexe.exp
-elif [ "$(uname -m)" = "i686" ]; then
-    echo "TESTING: memory-deny-write-execute (test/filters/memwrexe-32.exp)"
-    ./memwrexe-32.exp
+if [[ $(uname -m) == "x86_64" ]]; then
+        echo "TESTING: memory-deny-write-execute (test/filters/memwrexe.exp)"
+        ./memwrexe.exp
+elif [[ $(uname -m) == "i686" ]]; then
+        echo "TESTING: memory-deny-write-execute (test/filters/memwrexe-32.exp)"
+        ./memwrexe-32.exp
 else
-    echo "TESTING SKIP: memwrexe binary only running on x86_64 and i686."
+        echo "TESTING SKIP: memwrexe binary only running on x86_64 and i686."
 fi
 
 echo "TESTING: debug options (test/filters/debug.exp)"
 ./debug.exp
 
-if [ "$(uname -m)" = "x86_64" ]; then
-    echo "TESTING: seccomp run files (test/filters/seccomp-run-files.exp)"
-    ./seccomp-run-files.exp
+if [[ $(uname -m) == "x86_64" ]]; then
+        echo "TESTING: seccomp run files (test/filters/seccomp-run-files.exp)"
+        ./seccomp-run-files.exp
 else
-    echo "TESTING SKIP: seccomp-run-files test implemented only for x86_64."
+        echo "TESTING SKIP: seccomp-run-files test implemented only for x86_64."
 fi
 
 echo "TESTING: seccomp postexec (test/filters/seccomp-postexec.exp)"
@@ -61,33 +61,33 @@ echo "TESTING: capabilities join (test/filters/caps-join.exp)"
 ./caps-join.exp
 
 rm -f seccomp-test-file
-if [ "$(uname -m)" = "x86_64" ]; then
-       echo "TESTING: fseccomp (test/filters/fseccomp.exp)"
-        ./fseccomp.exp
+if [[ $(uname -m) == "x86_64" ]]; then
+        echo "TESTING: fseccomp (test/filters/fseccomp.exp)"
+        ./fseccomp.exp
 else
-        echo "TESTING SKIP: fseccomp test implemented only for x86_64"
+        echo "TESTING SKIP: fseccomp test implemented only for x86_64"
 fi
 rm -f seccomp-test-file
 
 
-if [ "$(uname -m)" = "x86_64" ]; then
-        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, running only on x86_64"
+        echo "TESTING SKIP: protocol, running only on x86_64"
 fi
 
 echo "TESTING: seccomp bad empty (test/filters/seccomp-bad-empty.exp)"
 ./seccomp-bad-empty.exp
 
-if [ "$(uname -m)" = "x86_64" ]; then
-        echo "TESTING: seccomp debug  (test/filters/seccomp-debug.exp)"
+if [[ $(uname -m) == "x86_64" ]]; then
+        echo "TESTING: seccomp debug (test/filters/seccomp-debug.exp)"
         ./seccomp-debug.exp
-elif [ "$(uname -m)" = "i686" ]; then
-        echo "TESTING: seccomp debug  (test/filters/seccomp-debug-32.exp)"
+elif [[ $(uname -m) == "i686" ]]; then
+        echo "TESTING: seccomp debug (test/filters/seccomp-debug-32.exp)"
         ./seccomp-debug-32.exp
 else
-        echo "TESTING SKIP: protocol, running only on x86_64 and i686"
+        echo "TESTING SKIP: protocol, running only on x86_64 and i686"
 fi
 
 echo "TESTING: seccomp errno (test/filters/seccomp-errno.exp)"
@@ -96,12 +96,11 @@ echo "TESTING: seccomp errno (test/filters/seccomp-errno.exp)"
 echo "TESTING: seccomp su (test/filters/seccomp-su.exp)"
 ./seccomp-su.exp
 
-which strace 2>/dev/null
-if [ $? -eq 0 ]; then
-        echo "TESTING: seccomp ptrace (test/filters/seccomp-ptrace.exp)"
-        ./seccomp-ptrace.exp
+if command -v strace; then
+        echo "TESTING: seccomp ptrace (test/filters/seccomp-ptrace.exp)"
+        ./seccomp-ptrace.exp
 else
-        echo "TESTING SKIP: ptrace, strace not found"
+        echo "TESTING SKIP: ptrace, strace not found"
 fi
 
 echo "TESTING: seccomp chmod - seccomp lists (test/filters/seccomp-chmod.exp)"
@@ -115,16 +114,16 @@ echo "TESTING: seccomp chmod profile - seccomp lists (test/filters/seccomp-chmod
 echo "TESTING: seccomp empty (test/filters/seccomp-empty.exp)"
 ./seccomp-empty.exp
 
-if [ "$(uname -m)" = "x86_64" ]; then
-    echo "TESTING: seccomp numeric (test/filters/seccomp-numeric.exp)"
-    ./seccomp-numeric.exp
+if [[ $(uname -m) == "x86_64" ]]; then
+        echo "TESTING: seccomp numeric (test/filters/seccomp-numeric.exp)"
+        ./seccomp-numeric.exp
 else
-        echo "TESTING SKIP: seccomp numeric test implemented only for x86_64"
+        echo "TESTING SKIP: seccomp numeric test implemented only for x86_64"
 fi
 
-if [ "$(uname -m)" = "x86_64" ]; then
-       echo "TESTING: seccomp join (test/filters/seccomp-join.exp)"
-        ./seccomp-join.exp
+if [[ $(uname -m) == "x86_64" ]]; then
+        echo "TESTING: seccomp join (test/filters/seccomp-join.exp)"
+        ./seccomp-join.exp
 else
-        echo "TESTING SKIP: seccomp join test implemented only for x86_64"
+        echo "TESTING SKIP: seccomp join test implemented only for x86_64"
 fi