diff options
Diffstat (limited to 'test/fs')
-rwxr-xr-x | test/fs/fs.sh | 3 | ||||
-rwxr-xr-x | test/fs/fscheck-bindnoroot.exp | 2 | ||||
-rwxr-xr-x | test/fs/fscheck-private.exp | 3 | ||||
-rwxr-xr-x | test/fs/fscheck-tmpfs.exp | 1 | ||||
-rwxr-xr-x | test/fs/invalid_filename.exp | 1 | ||||
-rwxr-xr-x | test/fs/kmsg.exp | 1 | ||||
-rwxr-xr-x | test/fs/option_bind_user.exp | 1 | ||||
-rwxr-xr-x | test/fs/option_blacklist.exp | 1 | ||||
-rwxr-xr-x | test/fs/option_blacklist_file.exp | 1 | ||||
-rwxr-xr-x | test/fs/option_blacklist_glob.exp | 1 | ||||
-rwxr-xr-x | test/fs/private-bin.exp | 1 | ||||
-rwxr-xr-x | test/fs/private-etc.exp | 1 | ||||
-rwxr-xr-x | test/fs/private-home.exp | 1 | ||||
-rwxr-xr-x | test/fs/private-homedir.exp | 1 | ||||
-rwxr-xr-x | test/fs/private-whitelist.exp | 1 | ||||
-rwxr-xr-x | test/fs/sys_fs.exp | 1 | ||||
-rw-r--r-- | test/fs/user-dirs.dirs | 2 | ||||
-rwxr-xr-x | test/fs/whitelist-dev.exp | 1 | ||||
-rwxr-xr-x | test/fs/whitelist-downloads.exp | 1 | ||||
-rwxr-xr-x | test/fs/whitelist.exp | 1 |
20 files changed, 2 insertions, 24 deletions
diff --git a/test/fs/fs.sh b/test/fs/fs.sh index 85eeaaf81..9e7ead3c9 100755 --- a/test/fs/fs.sh +++ b/test/fs/fs.sh | |||
@@ -111,6 +111,3 @@ rm -f ~/fjtest-file-lnk | |||
111 | rm -f /tmp/fjtest-file | 111 | rm -f /tmp/fjtest-file |
112 | rm -fr /tmp/fjtest-dir | 112 | rm -fr /tmp/fjtest-dir |
113 | rm -fr ~/_firejail_test_* | 113 | rm -fr ~/_firejail_test_* |
114 | |||
115 | |||
116 | |||
diff --git a/test/fs/fscheck-bindnoroot.exp b/test/fs/fscheck-bindnoroot.exp index 8cbe2b8af..431092f05 100755 --- a/test/fs/fscheck-bindnoroot.exp +++ b/test/fs/fscheck-bindnoroot.exp | |||
@@ -13,5 +13,3 @@ expect { | |||
13 | after 100 | 13 | after 100 |
14 | 14 | ||
15 | puts "\nall done\n" | 15 | puts "\nall done\n" |
16 | |||
17 | |||
diff --git a/test/fs/fscheck-private.exp b/test/fs/fscheck-private.exp index 28c921538..1972a683b 100755 --- a/test/fs/fscheck-private.exp +++ b/test/fs/fscheck-private.exp | |||
@@ -14,7 +14,7 @@ match_max 100000 | |||
14 | #} | 14 | #} |
15 | #after 100 | 15 | #after 100 |
16 | 16 | ||
17 | # file | 17 | # file |
18 | send -- "firejail --private=testfile1\r" | 18 | send -- "firejail --private=testfile1\r" |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 2.1\n";exit} | 20 | timeout {puts "TESTING ERROR 2.1\n";exit} |
@@ -47,4 +47,3 @@ expect { | |||
47 | after 100 | 47 | after 100 |
48 | 48 | ||
49 | puts "\nall done\n" | 49 | puts "\nall done\n" |
50 | |||
diff --git a/test/fs/fscheck-tmpfs.exp b/test/fs/fscheck-tmpfs.exp index deac5a631..f8901e336 100755 --- a/test/fs/fscheck-tmpfs.exp +++ b/test/fs/fscheck-tmpfs.exp | |||
@@ -11,4 +11,3 @@ expect { | |||
11 | "Error" | 11 | "Error" |
12 | } | 12 | } |
13 | after 100 | 13 | after 100 |
14 | |||
diff --git a/test/fs/invalid_filename.exp b/test/fs/invalid_filename.exp index db15bb6ba..3d734e852 100755 --- a/test/fs/invalid_filename.exp +++ b/test/fs/invalid_filename.exp | |||
@@ -201,4 +201,3 @@ expect { | |||
201 | after 100 | 201 | after 100 |
202 | 202 | ||
203 | puts "\nall done\n" | 203 | puts "\nall done\n" |
204 | |||
diff --git a/test/fs/kmsg.exp b/test/fs/kmsg.exp index 9d9467eac..8dd13b129 100755 --- a/test/fs/kmsg.exp +++ b/test/fs/kmsg.exp | |||
@@ -29,4 +29,3 @@ expect { | |||
29 | after 100 | 29 | after 100 |
30 | 30 | ||
31 | puts "\nall done\n" | 31 | puts "\nall done\n" |
32 | |||
diff --git a/test/fs/option_bind_user.exp b/test/fs/option_bind_user.exp index a2912968e..7ec55d82f 100755 --- a/test/fs/option_bind_user.exp +++ b/test/fs/option_bind_user.exp | |||
@@ -12,4 +12,3 @@ expect { | |||
12 | after 100 | 12 | after 100 |
13 | 13 | ||
14 | puts "\n" | 14 | puts "\n" |
15 | |||
diff --git a/test/fs/option_blacklist.exp b/test/fs/option_blacklist.exp index dcdf5facc..bf2a57999 100755 --- a/test/fs/option_blacklist.exp +++ b/test/fs/option_blacklist.exp | |||
@@ -35,4 +35,3 @@ expect { | |||
35 | after 100 | 35 | after 100 |
36 | 36 | ||
37 | puts "\n" | 37 | puts "\n" |
38 | |||
diff --git a/test/fs/option_blacklist_file.exp b/test/fs/option_blacklist_file.exp index b0164136c..6f789a792 100755 --- a/test/fs/option_blacklist_file.exp +++ b/test/fs/option_blacklist_file.exp | |||
@@ -23,4 +23,3 @@ expect { | |||
23 | after 100 | 23 | after 100 |
24 | 24 | ||
25 | puts "\n" | 25 | puts "\n" |
26 | |||
diff --git a/test/fs/option_blacklist_glob.exp b/test/fs/option_blacklist_glob.exp index f682ed619..3de1f736d 100755 --- a/test/fs/option_blacklist_glob.exp +++ b/test/fs/option_blacklist_glob.exp | |||
@@ -30,4 +30,3 @@ expect { | |||
30 | after 100 | 30 | after 100 |
31 | 31 | ||
32 | puts "\n" | 32 | puts "\n" |
33 | |||
diff --git a/test/fs/private-bin.exp b/test/fs/private-bin.exp index b8722130a..d4cdc3a36 100755 --- a/test/fs/private-bin.exp +++ b/test/fs/private-bin.exp | |||
@@ -90,4 +90,3 @@ expect { | |||
90 | 90 | ||
91 | after 100 | 91 | after 100 |
92 | puts "\nall done\n" | 92 | puts "\nall done\n" |
93 | |||
diff --git a/test/fs/private-etc.exp b/test/fs/private-etc.exp index c4b0da7b2..a2223b593 100755 --- a/test/fs/private-etc.exp +++ b/test/fs/private-etc.exp | |||
@@ -70,4 +70,3 @@ after 100 | |||
70 | 70 | ||
71 | after 100 | 71 | after 100 |
72 | puts "\nall done\n" | 72 | puts "\nall done\n" |
73 | |||
diff --git a/test/fs/private-home.exp b/test/fs/private-home.exp index 259eb4f9e..11fd52563 100755 --- a/test/fs/private-home.exp +++ b/test/fs/private-home.exp | |||
@@ -100,4 +100,3 @@ send -- "rm -f ~/_firejail_test*\r" | |||
100 | after 100 | 100 | after 100 |
101 | 101 | ||
102 | puts "\nall done\n" | 102 | puts "\nall done\n" |
103 | |||
diff --git a/test/fs/private-homedir.exp b/test/fs/private-homedir.exp index 4a8cf8369..78dfdc1c4 100755 --- a/test/fs/private-homedir.exp +++ b/test/fs/private-homedir.exp | |||
@@ -22,4 +22,3 @@ expect { | |||
22 | after 100 | 22 | after 100 |
23 | 23 | ||
24 | puts "\nall done\n" | 24 | puts "\nall done\n" |
25 | |||
diff --git a/test/fs/private-whitelist.exp b/test/fs/private-whitelist.exp index 0e75868b3..bbb1a757c 100755 --- a/test/fs/private-whitelist.exp +++ b/test/fs/private-whitelist.exp | |||
@@ -39,4 +39,3 @@ expect { | |||
39 | 39 | ||
40 | sleep 1 | 40 | sleep 1 |
41 | puts "\nall done\n" | 41 | puts "\nall done\n" |
42 | |||
diff --git a/test/fs/sys_fs.exp b/test/fs/sys_fs.exp index 8f63aedf7..23ae410be 100755 --- a/test/fs/sys_fs.exp +++ b/test/fs/sys_fs.exp | |||
@@ -41,4 +41,3 @@ send -- "exit\r" | |||
41 | after 100 | 41 | after 100 |
42 | 42 | ||
43 | puts "\nall done\n" | 43 | puts "\nall done\n" |
44 | |||
diff --git a/test/fs/user-dirs.dirs b/test/fs/user-dirs.dirs index 0d19da4e4..ea3a3a4c2 100644 --- a/test/fs/user-dirs.dirs +++ b/test/fs/user-dirs.dirs | |||
@@ -4,7 +4,7 @@ | |||
4 | # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped | 4 | # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped |
5 | # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an | 5 | # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an |
6 | # absolute path. No other format is supported. | 6 | # absolute path. No other format is supported. |
7 | # | 7 | # |
8 | XDG_DESKTOP_DIR="$HOME/Desktop" | 8 | XDG_DESKTOP_DIR="$HOME/Desktop" |
9 | XDG_DOWNLOAD_DIR="$HOME/Downloads" | 9 | XDG_DOWNLOAD_DIR="$HOME/Downloads" |
10 | XDG_TEMPLATES_DIR="$HOME/Templates" | 10 | XDG_TEMPLATES_DIR="$HOME/Templates" |
diff --git a/test/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp index 213542c88..7575faee0 100755 --- a/test/fs/whitelist-dev.exp +++ b/test/fs/whitelist-dev.exp | |||
@@ -45,4 +45,3 @@ sleep 1 | |||
45 | 45 | ||
46 | after 100 | 46 | after 100 |
47 | puts "\nall done\n" | 47 | puts "\nall done\n" |
48 | |||
diff --git a/test/fs/whitelist-downloads.exp b/test/fs/whitelist-downloads.exp index a64197953..ab411ca08 100755 --- a/test/fs/whitelist-downloads.exp +++ b/test/fs/whitelist-downloads.exp | |||
@@ -46,4 +46,3 @@ expect { | |||
46 | after 100 | 46 | after 100 |
47 | 47 | ||
48 | puts "\nall done\n" | 48 | puts "\nall done\n" |
49 | |||
diff --git a/test/fs/whitelist.exp b/test/fs/whitelist.exp index 8ebad48f0..2988209d3 100755 --- a/test/fs/whitelist.exp +++ b/test/fs/whitelist.exp | |||
@@ -223,4 +223,3 @@ after 200 | |||
223 | 223 | ||
224 | 224 | ||
225 | puts "\nall done\n" | 225 | puts "\nall done\n" |
226 | |||