aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Reiner Herrmann <reiner@reiner-h.de>2018-09-21 18:06:55 +0200
committerLibravatar Reiner Herrmann <reiner@reiner-h.de>2018-09-21 18:06:55 +0200
commit502b05ee280e96e8bc32928abd8fb2a3b37d770b (patch)
tree2f00294125c8af6657a9b5891b248f91313bb444
parentFix check for nobody user (diff)
downloadfirejail-502b05ee280e96e8bc32928abd8fb2a3b37d770b.tar.gz
firejail-502b05ee280e96e8bc32928abd8fb2a3b37d770b.tar.zst
firejail-502b05ee280e96e8bc32928abd8fb2a3b37d770b.zip
tests: skip tests checking for /dev/kmsg which might not be available
-rwxr-xr-xtest/fs/fs.sh8
-rwxr-xr-xtest/utils/fs-print.exp4
2 files changed, 8 insertions, 4 deletions
diff --git a/test/fs/fs.sh b/test/fs/fs.sh
index d3c17e7a5..a462a4362 100755
--- a/test/fs/fs.sh
+++ b/test/fs/fs.sh
@@ -25,8 +25,12 @@ rm -fr ~/_firejail_test_*
25echo "TESTING: /sys/fs access (test/fs/sys_fs.exp)" 25echo "TESTING: /sys/fs access (test/fs/sys_fs.exp)"
26./sys_fs.exp 26./sys_fs.exp
27 27
28echo "TESTING: kmsg access (test/fs/kmsg.exp)" 28if [ -c /dev/kmsg ]; then
29./kmsg.exp 29 echo "TESTING: kmsg access (test/fs/kmsg.exp)"
30 ./kmsg.exp
31else
32 echo "TESTING SKIP: /dev/kmsg not available"
33fi
30 34
31echo "TESTING: read/write /var/tmp (test/fs/fs_var_tmp.exp)" 35echo "TESTING: read/write /var/tmp (test/fs/fs_var_tmp.exp)"
32./fs_var_tmp.exp 36./fs_var_tmp.exp
diff --git a/test/utils/fs-print.exp b/test/utils/fs-print.exp
index 450945b66..21f6f68ff 100755
--- a/test/utils/fs-print.exp
+++ b/test/utils/fs-print.exp
@@ -22,11 +22,11 @@ expect {
22} 22}
23expect { 23expect {
24 timeout {puts "TESTING ERROR 2\n";exit} 24 timeout {puts "TESTING ERROR 2\n";exit}
25 "blacklist /dev/kmsg" 25 "blacklist /proc/kmsg"
26} 26}
27expect { 27expect {
28 timeout {puts "TESTING ERROR 3\n";exit} 28 timeout {puts "TESTING ERROR 3\n";exit}
29 "blacklist /proc/kmsg" 29 "blacklist /bin/su"
30} 30}
31after 100 31after 100
32puts "\nall done\n" 32puts "\nall done\n"