From 502b05ee280e96e8bc32928abd8fb2a3b37d770b Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Fri, 21 Sep 2018 18:06:55 +0200 Subject: tests: skip tests checking for /dev/kmsg which might not be available --- test/fs/fs.sh | 8 ++++++-- test/utils/fs-print.exp | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'test') 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_* echo "TESTING: /sys/fs access (test/fs/sys_fs.exp)" ./sys_fs.exp -echo "TESTING: kmsg access (test/fs/kmsg.exp)" -./kmsg.exp +if [ -c /dev/kmsg ]; then + echo "TESTING: kmsg access (test/fs/kmsg.exp)" + ./kmsg.exp +else + echo "TESTING SKIP: /dev/kmsg not available" +fi echo "TESTING: read/write /var/tmp (test/fs/fs_var_tmp.exp)" ./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 { } expect { timeout {puts "TESTING ERROR 2\n";exit} - "blacklist /dev/kmsg" + "blacklist /proc/kmsg" } expect { timeout {puts "TESTING ERROR 3\n";exit} - "blacklist /proc/kmsg" + "blacklist /bin/su" } after 100 puts "\nall done\n" -- cgit v1.2.3-54-g00ecf