7 files changed, 85 insertions, 30 deletions

diff --git a/test/filters/apparmor.exp b/test/filters/apparmor.exp
index 13ce4dd06..0797a1db3 100755
--- a/test/filters/apparmor.exp
+++ b/test/filters/apparmor.exp
@@ -30,7 +30,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "AppArmor: firejail-default enforce"
+        "AppArmor: firejail-default//&unconfined enforce"
 }
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
@@ -38,21 +38,21 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "AppArmor: firejail-default enforce"
+        "AppArmor: firejail-default//&unconfined enforce"
 }
 after 100
 
 send -- "firejail --apparmor.print=test1\r"
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
-        "AppArmor: firejail-default enforce"
+        "AppArmor: firejail-default//&unconfined enforce"
 }
 after 100
 
 send -- "firejail --apparmor.print=test2\r"
 expect {
         timeout {puts "TESTING ERROR 7\n";exit}
-        "AppArmor: firejail-default enforce"
+        "AppArmor: firejail-default//&unconfined enforce"
 }
 after 100
 
diff --git a/test/filters/protocol.exp b/test/filters/protocol.exp
index cbc7fdc1a..96ac8d586 100755
--- a/test/filters/protocol.exp
+++ b/test/filters/protocol.exp
@@ -10,35 +10,88 @@ match_max 100000
 send -- "firejail --noprofile --protocol=unix --debug\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "0009: 20 00 00 00000000   ld  data.syscall-number"
+        "0009: 20 00 00 00000000"
 }
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
-        "000a: 15 01 00 00000029   jeq socket 000c (false 000b)"
+        "000f: 20 00 00 00000010"
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "000b: 06 00 00 7fff0000   ret ALLOW"
+        "0010: 15 00 01 00000001"
 }
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "000c: 20 00 00 00000010   ld  data.args"
+        "0011: 06 00 00 7fff0000"
 }
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "000d: 15 00 01 00000001   jeq 1 000e (false 000f)"
+        "0012: 06 00 00 0005005f"
+}
+
+after 100
+send -- "exit\r"
+sleep 1
+
+send -- "firejail --noprofile --protocol=bluetooth --debug\r"
+expect {
+        timeout {puts "TESTING ERROR 11\n";exit}
+        "0009: 20 00 00 00000000"
+}
+expect {
+        timeout {puts "TESTING ERROR 12\n";exit}
+        "000f: 20 00 00 00000010"
+}
+expect {
+        timeout {puts "TESTING ERROR 13\n";exit}
+        "0010: 15 00 01 0000001f"
+}
+expect {
+        timeout {puts "TESTING ERROR 14\n";exit}
+        "0011: 06 00 00 7fff0000"
+}
+expect {
+        timeout {puts "TESTING ERROR1 5\n";exit}
+        "0012: 06 00 00 0005005f"
+}
+
+after 100
+send -- "exit\r"
+sleep 1
+
+send -- "firejail --noprofile --protocol=inet,inet6 --debug\r"
+expect {
+        timeout {puts "TESTING ERROR 31\n";exit}
+        "0009: 20 00 00 00000000"
+}
+expect {
+        timeout {puts "TESTING ERROR 32\n";exit}
+        "000f: 20 00 00 00000010"
 }
 expect {
-        timeout {puts "TESTING ERROR 6\n";exit}
-        "000e: 06 00 00 7fff0000   ret ALLOW"
-        ""
+        timeout {puts "TESTING ERROR 33\n";exit}
+        "0010: 15 00 01 00000002"
 }
 expect {
-        timeout {puts "TESTING ERROR 7\n";exit}
-        "000f: 06 00 00 0005005f   ret ERRNO(95)"
+        timeout {puts "TESTING ERROR 34\n";exit}
+        "0011: 06 00 00 7fff0000"
+}
+expect {
+        timeout {puts "TESTING ERROR1 35\n";exit}
+        "0012: 15 00 01 0000000a"
+}
+expect {
+        timeout {puts "TESTING ERROR 36\n";exit}
+        "0013: 06 00 00 7fff0000"
+}
+expect {
+        timeout {puts "TESTING ERROR 37\n";exit}
+        "0014: 06 00 00 0005005f"
 }
 
 after 100
 send -- "exit\r"
+
+
 after 100
 puts "\nall done\n"
diff --git a/test/filters/seccomp-run-files.exp b/test/filters/seccomp-run-files.exp
index 59a576c20..95258ad4a 100755
--- a/test/filters/seccomp-run-files.exp
+++ b/test/filters/seccomp-run-files.exp
@@ -24,7 +24,7 @@ after 100
 send -- "ls -l /run/firejail/mnt/seccomp | grep -c seccomp\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "6"
+        "8"
 }
 send -- "exit\r"
 sleep 1
@@ -90,7 +90,7 @@ after 100
 send -- "ls -l /run/firejail/mnt/seccomp | grep -c seccomp\r"
 expect {
         timeout {puts "TESTING ERROR 18\n";exit}
-        "8"
+        "10"
 }
 send -- "exit\r"
 sleep 1
diff --git a/test/fs/fs.sh b/test/fs/fs.sh
index 697c86d3d..7c8573661 100755
--- a/test/fs/fs.sh
+++ b/test/fs/fs.sh
@@ -45,17 +45,6 @@ echo "TESTING: read/write /var/tmp (test/fs/fs_var_tmp.exp)"
 ./fs_var_tmp.exp
 rm -f /var/tmp/_firejail_test_file
 
-if [[ $(uname -m) == "x86_64" ]]; then
-        fjconfig=/etc/firejail/firejail.config
-        printf 'private-lib yes\n' | sudo tee -a "$fjconfig" >/dev/null
-        echo "TESTING: private-lib (test/fs/private-lib.exp)"
-        ./private-lib.exp
-        printf '%s\n' "$(sed '/^private-lib yes$/d' "$fjconfig")" |
-                sudo tee "$fjconfig" >/dev/null
-else
-        echo "TESTING SKIP: private-lib test implemented only for x86_64."
-fi
-
 echo "TESTING: read/write /var/lock (test/fs/fs_var_lock.exp)"
 ./fs_var_lock.exp
 rm -f /var/lock/_firejail_test_file
@@ -153,8 +142,9 @@ echo "TESTING: whitelist (test/fs/whitelist.exp)"
 ./whitelist.exp
 rm -fr ~/_firejail_test_*
 
-echo "TESTING: whitelist dev, var(test/fs/whitelist-dev.exp)"
-./whitelist-dev.exp
+# TODO: whitelist /dev broken in 0.9.72
+#echo "TESTING: whitelist dev, var(test/fs/whitelist-dev.exp)"
+#./whitelist-dev.exp
 
 echo "TESTING: whitelist noexec (test/fs/whitelist-noexec.exp)"
 ./whitelist-noexec.exp
diff --git a/test/fs/whitelist-empty.exp b/test/fs/whitelist-empty.exp
index 18d4561d6..fc860f219 100755
--- a/test/fs/whitelist-empty.exp
+++ b/test/fs/whitelist-empty.exp
@@ -7,7 +7,7 @@ set timeout 30
 spawn $env(SHELL)
 match_max 100000
 
-send -- "firejail --whitelist=~/blablabla --whitelist=/tmp/blablabla --whitelist=/media/blablabla --whitelist=/var/blablabla --whitelist=/dev/blablabla --whitelist=/opt/blablabla\r"
+send -- "firejail --whitelist=~/blablabla --whitelist=/tmp/blablabla --whitelist=/media/blablabla --whitelist=/var/blablabla --whitelist=/opt/blablabla\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
diff --git a/test/fs/private-lib.exp b/test/private-lib/private-lib.exp
index 5290def35..5290def35 100755
--- a/test/fs/private-lib.exp
+++ b/test/private-lib/private-lib.exp
diff --git a/test/private-lib/private-lib.sh b/test/private-lib/private-lib.sh
index 6b7d433c8..43c42a098 100755
--- a/test/private-lib/private-lib.sh
+++ b/test/private-lib/private-lib.sh
@@ -18,3 +18,15 @@ for app in "${apps[@]}"; do
                 echo "TESTING SKIP: $app not found"
         fi
 done
+
+if [[ $(uname -m) == "x86_64" ]]; then
+        fjconfig=/etc/firejail/firejail.config
+        printf 'private-lib yes\n' | sudo tee -a "$fjconfig" >/dev/null
+        echo "TESTING: private-lib (test/fs/private-lib.exp)"
+        ./private-lib.exp
+        printf '%s\n' "$(sed '/^private-lib yes$/d' "$fjconfig")" |
+                sudo tee "$fjconfig" >/dev/null
+else
+        echo "TESTING SKIP: private-lib test implemented only for x86_64."
+fi
+