testing and cleanup

3 files changed, 63 insertions, 13 deletions

diff --git a/test/fs/fs.sh b/test/fs/fs.sh
index d9a425661..611b62b09 100755
--- a/test/fs/fs.sh
+++ b/test/fs/fs.sh
@@ -88,6 +88,9 @@ echo "TESTING: double whitelist (test/fs/whitelist-double.exp)"
 echo "TESTING: whitelist (test/fs/whitelist.exp)"
 ./whitelist.exp
 
+echo "TESTING: whitelist dev, var(test/fs/whitelist-dev.exp)"
+./whitelist-dev.exp
+
 echo "TESTING: fscheck --bind non root (test/fs/fscheck-bindnoroot.exp)"
 ./fscheck-bindnoroot.exp
 
diff --git a/test/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp
new file mode 100755
index 000000000..a19d5cedf
--- /dev/null
+++ b/test/fs/whitelist-dev.exp
@@ -0,0 +1,47 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send -- "firejail --whitelist=/dev/null --debug\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+send -- "ls -l /dev | find /dev | wc -l\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "2"
+}
+after 100
+send -- "exit\r"
+sleep 1
+
+send -- "firejail --whitelist=/var/tmp --debug\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+send -- "ls -l /dev | find /dev | wc -l\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "2"
+}
+after 100
+send -- "exit\r"
+sleep 1
+
+
+
+
+after 100
+puts "\nall done\n"
+
diff --git a/test/fs/whitelist.exp b/test/fs/whitelist.exp
index 9a9a0f353..9b631b884 100755
--- a/test/fs/whitelist.exp
+++ b/test/fs/whitelist.exp
@@ -36,7 +36,7 @@ after 200
 send -- "ln -s ~/fjtest-dir ~/fjtest-dir-lnk\r"
 after 200
 
-send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir\r"
+send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir --debug\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
@@ -49,19 +49,19 @@ expect {
         "2"
 }
 
-send -- "cat fjtest-file\r"
+send -- "cat ~/fjtest-file\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
         "123"
 }
 
-send -- "cat fjtest-dir/fjtest-file\r"
+send -- "cat ~/fjtest-dir/fjtest-file\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         "123"
 }
 
-send -- "cat fjtest-dir/fjtest-dir/fjtest-file\r"
+send -- "cat ~/fjtest-dir/fjtest-dir/fjtest-file\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
         "123"
@@ -86,7 +86,7 @@ expect {
         "1"
 }
 
-send -- "cat fjtest-dir/fjtest-dir/fjtest-file\r"
+send -- "cat ~/fjtest-dir/fjtest-dir/fjtest-file\r"
 expect {
         timeout {puts "TESTING ERROR 12\n";exit}
         "123"
@@ -111,37 +111,37 @@ expect {
         "4"
 }
 
-send -- "cat fjtest-file\r"
+send -- "cat ~/fjtest-file\r"
 expect {
         timeout {puts "TESTING ERROR 22\n";exit}
         "123"
 }
 
-send -- "cat fjtest-dir/fjtest-file\r"
+send -- "cat ~/fjtest-dir/fjtest-file\r"
 expect {
         timeout {puts "TESTING ERROR 23\n";exit}
         "123"
 }
 
-send -- "cat fjtest-dir/fjtest-dir/fjtest-file\r"
+send -- "cat ~/fjtest-dir/fjtest-dir/fjtest-file\r"
 expect {
         timeout {puts "TESTING ERROR 24\n";exit}
         "123"
 }
 
-send -- "cat fjtest-file-lnk\r"
+send -- "cat ~/fjtest-file-lnk\r"
 expect {
         timeout {puts "TESTING ERROR 25\n";exit}
         "123"
 }
 
-send -- "cat fjtest-dir-lnk/fjtest-file\r"
+send -- "cat ~/fjtest-dir-lnk/fjtest-file\r"
 expect {
         timeout {puts "TESTING ERROR 26\n";exit}
         "123"
 }
 
-send -- "cat fjtest-dir-lnk/fjtest-dir/fjtest-file\r"
+send -- "cat ~/fjtest-dir-lnk/fjtest-dir/fjtest-file\r"
 expect {
         timeout {puts "TESTING ERROR 27\n";exit}
         "123"
@@ -193,13 +193,13 @@ expect {
         "2"
 }
 
-send -- "cat fjtest-file-lnk\r"
+send -- "cat ~/fjtest-file-lnk\r"
 expect {
         timeout {puts "TESTING ERROR 42\n";exit}
         "123"
 }
 
-send -- "cat fjtest-dir-lnk/fjtest-file\r"
+send -- "cat ~/fjtest-dir-lnk/fjtest-file\r"
 expect {
         timeout {puts "TESTING ERROR 43\n";exit}
         "123"