diff options
author | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:38:01 -0500 |
---|---|---|
committer | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-05-24 14:38:01 -0500 |
commit | 997a93efbdcbbaeed517e0bdc5283e9d8b31f422 (patch) | |
tree | cbb47fb1b41ced351501686e3fdf9aaf46b31414 /test | |
parent | Remove trailing whitespace from platform (diff) | |
download | firejail-997a93efbdcbbaeed517e0bdc5283e9d8b31f422.tar.gz firejail-997a93efbdcbbaeed517e0bdc5283e9d8b31f422.tar.zst firejail-997a93efbdcbbaeed517e0bdc5283e9d8b31f422.zip |
strip trailing whitespace from test/
Diffstat (limited to 'test')
190 files changed, 136 insertions, 292 deletions
diff --git a/test/appimage/appimage-args.exp b/test/appimage/appimage-args.exp index b93ad509d..a2cc9285e 100755 --- a/test/appimage/appimage-args.exp +++ b/test/appimage/appimage-args.exp | |||
@@ -102,4 +102,3 @@ expect { | |||
102 | after 100 | 102 | after 100 |
103 | 103 | ||
104 | puts "\nall done\n" | 104 | puts "\nall done\n" |
105 | |||
diff --git a/test/appimage/appimage-v1.exp b/test/appimage/appimage-v1.exp index 3364ff677..86a968125 100755 --- a/test/appimage/appimage-v1.exp +++ b/test/appimage/appimage-v1.exp | |||
@@ -90,4 +90,3 @@ expect { | |||
90 | after 100 | 90 | after 100 |
91 | 91 | ||
92 | puts "\nall done\n" | 92 | puts "\nall done\n" |
93 | |||
diff --git a/test/appimage/appimage-v2.exp b/test/appimage/appimage-v2.exp index ad741c559..f89ac008c 100755 --- a/test/appimage/appimage-v2.exp +++ b/test/appimage/appimage-v2.exp | |||
@@ -89,4 +89,3 @@ expect { | |||
89 | after 100 | 89 | after 100 |
90 | 90 | ||
91 | puts "\nall done\n" | 91 | puts "\nall done\n" |
92 | |||
diff --git a/test/appimage/appimage.sh b/test/appimage/appimage.sh index 6d0fcf081..4221944e2 100755 --- a/test/appimage/appimage.sh +++ b/test/appimage/appimage.sh | |||
@@ -17,4 +17,3 @@ echo "TESTING: AppImage file name (test/appimage/filename.exp)"; | |||
17 | 17 | ||
18 | echo "TESTING: AppImage argsv1 (test/appimage/appimage-args.exp)" | 18 | echo "TESTING: AppImage argsv1 (test/appimage/appimage-args.exp)" |
19 | ./appimage-args.exp | 19 | ./appimage-args.exp |
20 | |||
diff --git a/test/appimage/filename.exp b/test/appimage/filename.exp index 5038ab21c..ebf2125f0 100755 --- a/test/appimage/filename.exp +++ b/test/appimage/filename.exp | |||
@@ -32,4 +32,3 @@ after 100 | |||
32 | 32 | ||
33 | 33 | ||
34 | puts "\nall done\n" | 34 | puts "\nall done\n" |
35 | |||
diff --git a/test/apps-x11-xorg/apps-x11-xorg.sh b/test/apps-x11-xorg/apps-x11-xorg.sh index 7d1d681ab..6f051b28d 100755 --- a/test/apps-x11-xorg/apps-x11-xorg.sh +++ b/test/apps-x11-xorg/apps-x11-xorg.sh | |||
@@ -32,4 +32,3 @@ then | |||
32 | else | 32 | else |
33 | echo "TESTING SKIP: thunderbird not found" | 33 | echo "TESTING SKIP: thunderbird not found" |
34 | fi | 34 | fi |
35 | |||
diff --git a/test/apps-x11-xorg/firefox.exp b/test/apps-x11-xorg/firefox.exp index 4fd17caa6..a0e8284d3 100755 --- a/test/apps-x11-xorg/firefox.exp +++ b/test/apps-x11-xorg/firefox.exp | |||
@@ -88,4 +88,3 @@ send -- "firejail --shutdown=test\r" | |||
88 | sleep 3 | 88 | sleep 3 |
89 | 89 | ||
90 | puts "\nall done\n" | 90 | puts "\nall done\n" |
91 | |||
diff --git a/test/apps-x11-xorg/thunderbird.exp b/test/apps-x11-xorg/thunderbird.exp index 1626c732b..42220b52e 100755 --- a/test/apps-x11-xorg/thunderbird.exp +++ b/test/apps-x11-xorg/thunderbird.exp | |||
@@ -83,4 +83,3 @@ send -- "firejail --shutdown=test\r" | |||
83 | sleep 3 | 83 | sleep 3 |
84 | 84 | ||
85 | puts "\nall done\n" | 85 | puts "\nall done\n" |
86 | |||
diff --git a/test/apps-x11-xorg/transmission-gtk.exp b/test/apps-x11-xorg/transmission-gtk.exp index 3eb537c1b..aec4c46ad 100755 --- a/test/apps-x11-xorg/transmission-gtk.exp +++ b/test/apps-x11-xorg/transmission-gtk.exp | |||
@@ -83,4 +83,3 @@ send -- "firejail --shutdown=test\r" | |||
83 | sleep 3 | 83 | sleep 3 |
84 | 84 | ||
85 | puts "\nall done\n" | 85 | puts "\nall done\n" |
86 | |||
diff --git a/test/apps-x11/apps-x11.sh b/test/apps-x11/apps-x11.sh index 965f1a56b..1e98b74fd 100755 --- a/test/apps-x11/apps-x11.sh +++ b/test/apps-x11/apps-x11.sh | |||
@@ -22,7 +22,7 @@ then | |||
22 | echo "TESTING: xterm x11 xpra" | 22 | echo "TESTING: xterm x11 xpra" |
23 | ./xterm-xpra.exp | 23 | ./xterm-xpra.exp |
24 | fi | 24 | fi |
25 | 25 | ||
26 | which Xephyr | 26 | which Xephyr |
27 | if [ "$?" -eq 0 ]; | 27 | if [ "$?" -eq 0 ]; |
28 | then | 28 | then |
@@ -85,4 +85,3 @@ then | |||
85 | else | 85 | else |
86 | echo "TESTING SKIP: thunderbird not found" | 86 | echo "TESTING SKIP: thunderbird not found" |
87 | fi | 87 | fi |
88 | |||
diff --git a/test/apps-x11/chromium.exp b/test/apps-x11/chromium.exp index eeedd99c4..3ec2bc049 100755 --- a/test/apps-x11/chromium.exp +++ b/test/apps-x11/chromium.exp | |||
@@ -81,6 +81,5 @@ sleep 1 | |||
81 | send -- "firejail --shutdown=test\r" | 81 | send -- "firejail --shutdown=test\r" |
82 | sleep 3 | 82 | sleep 3 |
83 | 83 | ||
84 | |||
85 | puts "\nall done\n" | ||
86 | 84 | ||
85 | puts "\nall done\n" | ||
diff --git a/test/apps-x11/firefox.exp b/test/apps-x11/firefox.exp index 5464e39cd..c77d120a8 100755 --- a/test/apps-x11/firefox.exp +++ b/test/apps-x11/firefox.exp | |||
@@ -88,4 +88,3 @@ send -- "firejail --shutdown=test\r" | |||
88 | sleep 3 | 88 | sleep 3 |
89 | 89 | ||
90 | puts "\nall done\n" | 90 | puts "\nall done\n" |
91 | |||
diff --git a/test/apps-x11/thunderbird.exp b/test/apps-x11/thunderbird.exp index 060b5a760..604a6a0d3 100755 --- a/test/apps-x11/thunderbird.exp +++ b/test/apps-x11/thunderbird.exp | |||
@@ -83,4 +83,3 @@ send -- "firejail --shutdown=test\r" | |||
83 | sleep 3 | 83 | sleep 3 |
84 | 84 | ||
85 | puts "\nall done\n" | 85 | puts "\nall done\n" |
86 | |||
diff --git a/test/apps-x11/transmission-gtk.exp b/test/apps-x11/transmission-gtk.exp index 8dae20e31..8403b7a9f 100755 --- a/test/apps-x11/transmission-gtk.exp +++ b/test/apps-x11/transmission-gtk.exp | |||
@@ -83,4 +83,3 @@ send -- "firejail --shutdown=test\r" | |||
83 | sleep 3 | 83 | sleep 3 |
84 | 84 | ||
85 | puts "\nall done\n" | 85 | puts "\nall done\n" |
86 | |||
diff --git a/test/apps-x11/x11-none.exp b/test/apps-x11/x11-none.exp index 1f3e1439a..e811533f9 100755 --- a/test/apps-x11/x11-none.exp +++ b/test/apps-x11/x11-none.exp | |||
@@ -45,4 +45,3 @@ expect { | |||
45 | after 100 | 45 | after 100 |
46 | 46 | ||
47 | puts "\nall done\n" | 47 | puts "\nall done\n" |
48 | |||
diff --git a/test/apps-x11/x11-xephyr.exp b/test/apps-x11/x11-xephyr.exp index 31a434103..3f032ae4a 100755 --- a/test/apps-x11/x11-xephyr.exp +++ b/test/apps-x11/x11-xephyr.exp | |||
@@ -56,4 +56,3 @@ expect { | |||
56 | after 100 | 56 | after 100 |
57 | 57 | ||
58 | puts "\nall done\n" | 58 | puts "\nall done\n" |
59 | |||
diff --git a/test/apps-x11/xterm-xephyr.exp b/test/apps-x11/xterm-xephyr.exp index c36121a75..b1ee9e5b4 100755 --- a/test/apps-x11/xterm-xephyr.exp +++ b/test/apps-x11/xterm-xephyr.exp | |||
@@ -83,4 +83,3 @@ send -- "firejail --shutdown=test\r" | |||
83 | sleep 3 | 83 | sleep 3 |
84 | 84 | ||
85 | puts "\nall done\n" | 85 | puts "\nall done\n" |
86 | |||
diff --git a/test/apps-x11/xterm-xorg.exp b/test/apps-x11/xterm-xorg.exp index 04fc4b960..76c6891ea 100755 --- a/test/apps-x11/xterm-xorg.exp +++ b/test/apps-x11/xterm-xorg.exp | |||
@@ -83,4 +83,3 @@ send -- "firejail --shutdown=test\r" | |||
83 | sleep 3 | 83 | sleep 3 |
84 | 84 | ||
85 | puts "\nall done\n" | 85 | puts "\nall done\n" |
86 | |||
diff --git a/test/apps-x11/xterm-xpra.exp b/test/apps-x11/xterm-xpra.exp index e769e5e20..6425412c9 100755 --- a/test/apps-x11/xterm-xpra.exp +++ b/test/apps-x11/xterm-xpra.exp | |||
@@ -95,4 +95,3 @@ send -- "firejail --shutdown=test\r" | |||
95 | sleep 3 | 95 | sleep 3 |
96 | 96 | ||
97 | puts "\nall done\n" | 97 | puts "\nall done\n" |
98 | |||
diff --git a/test/apps/apps.sh b/test/apps/apps.sh index fc04f188b..86b7f636e 100755 --- a/test/apps/apps.sh +++ b/test/apps/apps.sh | |||
@@ -177,4 +177,3 @@ then | |||
177 | else | 177 | else |
178 | echo "TESTING SKIP: wine not found" | 178 | echo "TESTING SKIP: wine not found" |
179 | fi | 179 | fi |
180 | |||
diff --git a/test/apps/chromium.exp b/test/apps/chromium.exp index 635c07afa..041918d7f 100755 --- a/test/apps/chromium.exp +++ b/test/apps/chromium.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\n" | 83 | puts "\n" |
84 | |||
diff --git a/test/apps/deluge.exp b/test/apps/deluge.exp index 3f83a1e01..004b8d144 100755 --- a/test/apps/deluge.exp +++ b/test/apps/deluge.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\n" | 83 | puts "\n" |
84 | |||
diff --git a/test/apps/evince.exp b/test/apps/evince.exp index dbad46068..5eada5fdf 100755 --- a/test/apps/evince.exp +++ b/test/apps/evince.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\nall done\n" | 83 | puts "\nall done\n" |
84 | |||
diff --git a/test/apps/fbreader.exp b/test/apps/fbreader.exp index b5c58c909..d0ad8be0a 100755 --- a/test/apps/fbreader.exp +++ b/test/apps/fbreader.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\nall done\n" | 83 | puts "\nall done\n" |
84 | |||
diff --git a/test/apps/filezilla.exp b/test/apps/filezilla.exp index 7bef9dc27..da8c23773 100755 --- a/test/apps/filezilla.exp +++ b/test/apps/filezilla.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\nall done\n" | 83 | puts "\nall done\n" |
84 | |||
diff --git a/test/apps/firefox.exp b/test/apps/firefox.exp index 06b5a3bc3..84504ccbf 100755 --- a/test/apps/firefox.exp +++ b/test/apps/firefox.exp | |||
@@ -97,4 +97,3 @@ expect { | |||
97 | after 100 | 97 | after 100 |
98 | 98 | ||
99 | puts "\n" | 99 | puts "\n" |
100 | |||
diff --git a/test/apps/gnome-mplayer.exp b/test/apps/gnome-mplayer.exp index 0e879d33b..d0c370df0 100755 --- a/test/apps/gnome-mplayer.exp +++ b/test/apps/gnome-mplayer.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\nall done\n" | 83 | puts "\nall done\n" |
84 | |||
diff --git a/test/apps/gthumb.exp b/test/apps/gthumb.exp index ae2976910..9edcd68fe 100755 --- a/test/apps/gthumb.exp +++ b/test/apps/gthumb.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\nall done\n" | 83 | puts "\nall done\n" |
84 | |||
diff --git a/test/apps/hexchat.exp b/test/apps/hexchat.exp index 74f0a9fb6..9d78a9676 100755 --- a/test/apps/hexchat.exp +++ b/test/apps/hexchat.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\n" | 83 | puts "\n" |
84 | |||
diff --git a/test/apps/midori.exp b/test/apps/midori.exp index 764f3e4a4..be6df1cbd 100755 --- a/test/apps/midori.exp +++ b/test/apps/midori.exp | |||
@@ -82,4 +82,3 @@ after 100 | |||
82 | 82 | ||
83 | 83 | ||
84 | puts "\n" | 84 | puts "\n" |
85 | |||
diff --git a/test/apps/opera.exp b/test/apps/opera.exp index 8a8885afa..eb6aef719 100755 --- a/test/apps/opera.exp +++ b/test/apps/opera.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\n" | 83 | puts "\n" |
84 | |||
diff --git a/test/apps/qbittorrent.exp b/test/apps/qbittorrent.exp index bf23390a1..742d9baf1 100755 --- a/test/apps/qbittorrent.exp +++ b/test/apps/qbittorrent.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\n" | 83 | puts "\n" |
84 | |||
diff --git a/test/apps/thunderbird.exp b/test/apps/thunderbird.exp index 16b0dc60e..f1aad2871 100755 --- a/test/apps/thunderbird.exp +++ b/test/apps/thunderbird.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\nall done\n" | 83 | puts "\nall done\n" |
84 | |||
diff --git a/test/apps/transmission-gtk.exp b/test/apps/transmission-gtk.exp index d9e5869c8..4df1f7892 100755 --- a/test/apps/transmission-gtk.exp +++ b/test/apps/transmission-gtk.exp | |||
@@ -76,4 +76,3 @@ expect { | |||
76 | after 100 | 76 | after 100 |
77 | 77 | ||
78 | puts "\nall done\n" | 78 | puts "\nall done\n" |
79 | |||
diff --git a/test/apps/transmission-qt.exp b/test/apps/transmission-qt.exp index 189919720..63f135b1d 100755 --- a/test/apps/transmission-qt.exp +++ b/test/apps/transmission-qt.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\nall done\n" | 83 | puts "\nall done\n" |
84 | |||
diff --git a/test/apps/uget-gtk.exp b/test/apps/uget-gtk.exp index 10a14e11a..05dd9edc6 100755 --- a/test/apps/uget-gtk.exp +++ b/test/apps/uget-gtk.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\nall done\n" | 83 | puts "\nall done\n" |
84 | |||
diff --git a/test/apps/vlc.exp b/test/apps/vlc.exp index a1d4cc6b2..9d75c40d6 100755 --- a/test/apps/vlc.exp +++ b/test/apps/vlc.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\nall done\n" | 83 | puts "\nall done\n" |
84 | |||
diff --git a/test/apps/wine.exp b/test/apps/wine.exp index fc181c0cc..75f044ca6 100755 --- a/test/apps/wine.exp +++ b/test/apps/wine.exp | |||
@@ -30,4 +30,3 @@ expect { | |||
30 | } | 30 | } |
31 | 31 | ||
32 | puts "\nall done\n" | 32 | puts "\nall done\n" |
33 | |||
diff --git a/test/apps/xchat.exp b/test/apps/xchat.exp index 8df9f8925..427e09159 100755 --- a/test/apps/xchat.exp +++ b/test/apps/xchat.exp | |||
@@ -81,4 +81,3 @@ expect { | |||
81 | after 100 | 81 | after 100 |
82 | 82 | ||
83 | puts "\n" | 83 | puts "\n" |
84 | |||
diff --git a/test/arguments/arguments.sh b/test/arguments/arguments.sh index 73e589876..049236900 100755 --- a/test/arguments/arguments.sh +++ b/test/arguments/arguments.sh | |||
@@ -25,5 +25,3 @@ echo "TESTING: 4. --output option" | |||
25 | ./outrun.exp | 25 | ./outrun.exp |
26 | rm out | 26 | rm out |
27 | rm out.* | 27 | rm out.* |
28 | |||
29 | |||
diff --git a/test/arguments/joinrun.exp b/test/arguments/joinrun.exp index 4a34f8b4e..097becacc 100755 --- a/test/arguments/joinrun.exp +++ b/test/arguments/joinrun.exp | |||
@@ -37,7 +37,7 @@ expect { | |||
37 | } | 37 | } |
38 | 38 | ||
39 | # todo: remove exit and fix it | 39 | # todo: remove exit and fix it |
40 | exit | 40 | exit |
41 | 41 | ||
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 3.3.1\n";exit} | 43 | timeout {puts "TESTING ERROR 3.3.1\n";exit} |
diff --git a/test/blacklist-link.exp b/test/blacklist-link.exp index 84fa6c3f5..4252f875a 100755 --- a/test/blacklist-link.exp +++ b/test/blacklist-link.exp | |||
@@ -80,4 +80,3 @@ sleep 1 | |||
80 | 80 | ||
81 | 81 | ||
82 | puts "all done\n" | 82 | puts "all done\n" |
83 | |||
diff --git a/test/blacklist.exp b/test/blacklist.exp index 70012d167..9c3dddf1f 100755 --- a/test/blacklist.exp +++ b/test/blacklist.exp | |||
@@ -73,4 +73,3 @@ expect { | |||
73 | 73 | ||
74 | 74 | ||
75 | puts "\n" | 75 | puts "\n" |
76 | |||
diff --git a/test/chk_config.exp b/test/chk_config.exp index 253ebf98e..f47fd0eee 100755 --- a/test/chk_config.exp +++ b/test/chk_config.exp | |||
@@ -83,5 +83,3 @@ expect { | |||
83 | "home" {puts "regular user\n"} | 83 | "home" {puts "regular user\n"} |
84 | "root" {puts "root user\n"} | 84 | "root" {puts "root user\n"} |
85 | } | 85 | } |
86 | |||
87 | |||
diff --git a/test/chroot/fs_chroot.exp b/test/chroot/fs_chroot.exp index 2190db359..a071027e5 100755 --- a/test/chroot/fs_chroot.exp +++ b/test/chroot/fs_chroot.exp | |||
@@ -59,4 +59,3 @@ after 100 | |||
59 | 59 | ||
60 | 60 | ||
61 | puts "all done\n" | 61 | puts "all done\n" |
62 | |||
diff --git a/test/chroot/unchroot-as-root.exp b/test/chroot/unchroot-as-root.exp index 9f8a1d784..e4bedd539 100755 --- a/test/chroot/unchroot-as-root.exp +++ b/test/chroot/unchroot-as-root.exp | |||
@@ -24,4 +24,3 @@ expect { | |||
24 | after 100 | 24 | after 100 |
25 | 25 | ||
26 | puts "all done\n" | 26 | puts "all done\n" |
27 | |||
diff --git a/test/chroot/unchroot.c b/test/chroot/unchroot.c index 1982e07f3..4919637d6 100644 --- a/test/chroot/unchroot.c +++ b/test/chroot/unchroot.c | |||
@@ -13,28 +13,28 @@ void die(char *msg) { | |||
13 | int main(int argc, char *argv[]) | 13 | int main(int argc, char *argv[]) |
14 | { | 14 | { |
15 | int i; | 15 | int i; |
16 | 16 | ||
17 | if (chdir("/") != 0) | 17 | if (chdir("/") != 0) |
18 | die("chdir(/)"); | 18 | die("chdir(/)"); |
19 | 19 | ||
20 | if (mkdir("baz", 0777) != 0) | 20 | if (mkdir("baz", 0777) != 0) |
21 | ; //die("mkdir(baz)"); | 21 | ; //die("mkdir(baz)"); |
22 | 22 | ||
23 | if (chroot("baz") != 0) | 23 | if (chroot("baz") != 0) |
24 | die("chroot(baz)"); | 24 | die("chroot(baz)"); |
25 | 25 | ||
26 | for (i=0; i<50; i++) { | 26 | for (i=0; i<50; i++) { |
27 | if (chdir("..") != 0) | 27 | if (chdir("..") != 0) |
28 | die("chdir(..)"); | 28 | die("chdir(..)"); |
29 | } | 29 | } |
30 | 30 | ||
31 | if (chroot(".") != 0) | 31 | if (chroot(".") != 0) |
32 | die("chroot(.)"); | 32 | die("chroot(.)"); |
33 | 33 | ||
34 | printf("Exploit seems to work. =)\n"); | 34 | printf("Exploit seems to work. =)\n"); |
35 | 35 | ||
36 | execl("/bin/bash", "bash", "-i", (char *)0); | 36 | execl("/bin/bash", "bash", "-i", (char *)0); |
37 | die("exec bash"); | 37 | die("exec bash"); |
38 | 38 | ||
39 | exit(0); | 39 | exit(0); |
40 | } | 40 | } |
diff --git a/test/compile/compile.sh b/test/compile/compile.sh index 44e67fe22..9b7d19057 100755 --- a/test/compile/compile.sh +++ b/test/compile/compile.sh | |||
@@ -356,4 +356,3 @@ echo ${arr[12]} | |||
356 | echo ${arr[13]} | 356 | echo ${arr[13]} |
357 | echo ${arr[14]} | 357 | echo ${arr[14]} |
358 | echo ${arr[15]} | 358 | echo ${arr[15]} |
359 | |||
diff --git a/test/configure b/test/configure index 9acd021c8..bb955670b 100755 --- a/test/configure +++ b/test/configure | |||
@@ -6,7 +6,7 @@ ifconfig br0 10.10.20.1/29 up | |||
6 | iptables -t nat -A POSTROUTING -o eth0 -s 10.10.20.0/29 -j MASQUERADE | 6 | iptables -t nat -A POSTROUTING -o eth0 -s 10.10.20.0/29 -j MASQUERADE |
7 | # port forwarding | 7 | # port forwarding |
8 | # iptables -t nat -A PREROUTING -p tcp --dport 80 -j DNAT --to 10.10.20.2:80 | 8 | # iptables -t nat -A PREROUTING -p tcp --dport 80 -j DNAT --to 10.10.20.2:80 |
9 | 9 | ||
10 | brctl addbr br1 | 10 | brctl addbr br1 |
11 | ifconfig br1 10.10.30.1/24 up | 11 | ifconfig br1 10.10.30.1/24 up |
12 | brctl addbr br2 | 12 | brctl addbr br2 |
diff --git a/test/environment/allow-debuggers.exp b/test/environment/allow-debuggers.exp index f032e1c3e..359f94db1 100755 --- a/test/environment/allow-debuggers.exp +++ b/test/environment/allow-debuggers.exp | |||
@@ -29,7 +29,7 @@ expect { | |||
29 | expect { | 29 | expect { |
30 | timeout {puts "TESTING ERROR 4\n";exit} | 30 | timeout {puts "TESTING ERROR 4\n";exit} |
31 | "ioctl" | 31 | "ioctl" |
32 | } | 32 | } |
33 | expect { | 33 | expect { |
34 | timeout {puts "TESTING ERROR 5\n";exit} | 34 | timeout {puts "TESTING ERROR 5\n";exit} |
35 | "exit_group" | 35 | "exit_group" |
@@ -38,4 +38,3 @@ after 100 | |||
38 | 38 | ||
39 | 39 | ||
40 | puts "\nall done\n" | 40 | puts "\nall done\n" |
41 | |||
diff --git a/test/environment/csh.exp b/test/environment/csh.exp index 89de94b3c..633934791 100755 --- a/test/environment/csh.exp +++ b/test/environment/csh.exp | |||
@@ -33,4 +33,3 @@ send -- "exit\r" | |||
33 | after 100 | 33 | after 100 |
34 | 34 | ||
35 | puts "\n" | 35 | puts "\n" |
36 | |||
diff --git a/test/environment/dash.exp b/test/environment/dash.exp index cd051ea7c..cad4422a0 100755 --- a/test/environment/dash.exp +++ b/test/environment/dash.exp | |||
@@ -39,4 +39,3 @@ send -- "exit\r" | |||
39 | after 100 | 39 | after 100 |
40 | 40 | ||
41 | puts "\n" | 41 | puts "\n" |
42 | |||
diff --git a/test/environment/environment.sh b/test/environment/environment.sh index 1454026f9..308d99871 100755 --- a/test/environment/environment.sh +++ b/test/environment/environment.sh | |||
@@ -116,4 +116,3 @@ echo "TESTING: rlimit errors (test/environment/rlimit-bad.exp)" | |||
116 | 116 | ||
117 | echo "TESTING: rlimit errors profile (test/environment/rlimit-bad-profile.exp)" | 117 | echo "TESTING: rlimit errors profile (test/environment/rlimit-bad-profile.exp)" |
118 | ./rlimit-bad-profile.exp | 118 | ./rlimit-bad-profile.exp |
119 | |||
diff --git a/test/environment/extract_command.exp b/test/environment/extract_command.exp index 266f66ff5..72d7501aa 100755 --- a/test/environment/extract_command.exp +++ b/test/environment/extract_command.exp | |||
@@ -20,4 +20,3 @@ expect { | |||
20 | after 100 | 20 | after 100 |
21 | 21 | ||
22 | puts "\nall done\n" | 22 | puts "\nall done\n" |
23 | |||
diff --git a/test/environment/hostfile.exp b/test/environment/hostfile.exp index 06003f744..c42864432 100755 --- a/test/environment/hostfile.exp +++ b/test/environment/hostfile.exp | |||
@@ -29,4 +29,3 @@ send -- "exit\r" | |||
29 | after 100 | 29 | after 100 |
30 | 30 | ||
31 | puts "\nall done\n" | 31 | puts "\nall done\n" |
32 | |||
diff --git a/test/environment/ibus.exp b/test/environment/ibus.exp index 4344011a6..75c7f5450 100755 --- a/test/environment/ibus.exp +++ b/test/environment/ibus.exp | |||
@@ -25,4 +25,3 @@ after 100 | |||
25 | 25 | ||
26 | 26 | ||
27 | puts "\nall done\n" | 27 | puts "\nall done\n" |
28 | |||
diff --git a/test/environment/machineid.exp b/test/environment/machineid.exp index 85510247b..02eb6b232 100755 --- a/test/environment/machineid.exp +++ b/test/environment/machineid.exp | |||
@@ -22,4 +22,3 @@ send -- "exit\r" | |||
22 | after 100 | 22 | after 100 |
23 | 23 | ||
24 | puts "\nall done\n" | 24 | puts "\nall done\n" |
25 | |||
diff --git a/test/environment/nice.exp b/test/environment/nice.exp index 50e789c9e..f0ca93a5e 100755 --- a/test/environment/nice.exp +++ b/test/environment/nice.exp | |||
@@ -121,4 +121,3 @@ send -- "exit\r" | |||
121 | after 100 | 121 | after 100 |
122 | 122 | ||
123 | puts "\nall done\n" | 123 | puts "\nall done\n" |
124 | |||
diff --git a/test/environment/quiet.exp b/test/environment/quiet.exp index bab395f71..3ab6d7f53 100755 --- a/test/environment/quiet.exp +++ b/test/environment/quiet.exp | |||
@@ -18,4 +18,3 @@ expect { | |||
18 | after 100 | 18 | after 100 |
19 | 19 | ||
20 | puts "\nall done\n" | 20 | puts "\nall done\n" |
21 | |||
diff --git a/test/environment/rlimit-bad4.profile b/test/environment/rlimit-bad4.profile index aabe3d008..6156b34a7 100644 --- a/test/environment/rlimit-bad4.profile +++ b/test/environment/rlimit-bad4.profile | |||
@@ -1 +1 @@ | |||
rlimit-sigpending 67asd56 \ No newline at end of file | rlimit-sigpending 67asd56 | ||
diff --git a/test/environment/rlimit.profile b/test/environment/rlimit.profile index 271891c03..88fc9ff31 100644 --- a/test/environment/rlimit.profile +++ b/test/environment/rlimit.profile | |||
@@ -1,4 +1,4 @@ | |||
1 | rlimit-fsize 1024 | 1 | rlimit-fsize 1024 |
2 | rlimit-nproc 1000 | 2 | rlimit-nproc 1000 |
3 | rlimit-nofile 500 | 3 | rlimit-nofile 500 |
4 | rlimit-sigpending 200 \ No newline at end of file | 4 | rlimit-sigpending 200 |
diff --git a/test/environment/shell-none.exp b/test/environment/shell-none.exp index 69c8db067..6514e6840 100755 --- a/test/environment/shell-none.exp +++ b/test/environment/shell-none.exp | |||
@@ -45,4 +45,3 @@ after 100 | |||
45 | 45 | ||
46 | 46 | ||
47 | puts "\nall done\n" | 47 | puts "\nall done\n" |
48 | |||
diff --git a/test/environment/sound.exp b/test/environment/sound.exp index f1a251f34..18691b1f9 100755 --- a/test/environment/sound.exp +++ b/test/environment/sound.exp | |||
@@ -80,4 +80,3 @@ expect { | |||
80 | after 100 | 80 | after 100 |
81 | 81 | ||
82 | puts "\nall done\n" | 82 | puts "\nall done\n" |
83 | |||
diff --git a/test/environment/zsh.exp b/test/environment/zsh.exp index 1b6cdcdc5..711905f2c 100755 --- a/test/environment/zsh.exp +++ b/test/environment/zsh.exp | |||
@@ -33,4 +33,3 @@ send -- "exit\r" | |||
33 | after 100 | 33 | after 100 |
34 | 34 | ||
35 | puts "\nall done\n" | 35 | puts "\nall done\n" |
36 | |||
diff --git a/test/features/1.1.exp b/test/features/1.1.exp index 804b73135..2273a3b98 100755 --- a/test/features/1.1.exp +++ b/test/features/1.1.exp | |||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | "Child process initialized" {puts "normal system\n"} | 40 | "Child process initialized" {puts "normal system\n"} |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | 43 | ||
44 | send -- "ls -l /boot\r" | 44 | send -- "ls -l /boot\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 3\n";exit} | 46 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | "Child process initialized" | 61 | "Child process initialized" |
62 | } | 62 | } |
63 | sleep 1 | 63 | sleep 1 |
64 | 64 | ||
65 | send -- "ls -l /boot\r" | 65 | send -- "ls -l /boot\r" |
66 | expect { | 66 | expect { |
67 | timeout {puts "TESTING ERROR 5\n";exit} | 67 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.10.exp b/test/features/1.10.exp index e7d51007c..b668f5cd1 100755 --- a/test/features/1.10.exp +++ b/test/features/1.10.exp | |||
@@ -41,7 +41,7 @@ if { $overlay == "overlay" } { | |||
41 | "Child process initialized" {puts "normal system\n"} | 41 | "Child process initialized" {puts "normal system\n"} |
42 | } | 42 | } |
43 | sleep 1 | 43 | sleep 1 |
44 | 44 | ||
45 | send -- "ls -l /selinux\r" | 45 | send -- "ls -l /selinux\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 3\n";exit} | 47 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -63,7 +63,7 @@ if { $chroot == "chroot" } { | |||
63 | "Child process initialized" | 63 | "Child process initialized" |
64 | } | 64 | } |
65 | sleep 1 | 65 | sleep 1 |
66 | 66 | ||
67 | send -- "ls -l /selinux\r" | 67 | send -- "ls -l /selinux\r" |
68 | expect { | 68 | expect { |
69 | timeout {puts "TESTING ERROR 5\n";exit} | 69 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.2.exp b/test/features/1.2.exp index bcb227304..81f9531cb 100755 --- a/test/features/1.2.exp +++ b/test/features/1.2.exp | |||
@@ -64,7 +64,7 @@ if { $overlay == "overlay" } { | |||
64 | "Child process initialized" {puts "normal system\n"} | 64 | "Child process initialized" {puts "normal system\n"} |
65 | } | 65 | } |
66 | sleep 1 | 66 | sleep 1 |
67 | 67 | ||
68 | send -- "cat /proc/mounts | grep proc --color=never\r" | 68 | send -- "cat /proc/mounts | grep proc --color=never\r" |
69 | expect { | 69 | expect { |
70 | timeout {puts "TESTING ERROR 3.1\n";exit} | 70 | timeout {puts "TESTING ERROR 3.1\n";exit} |
@@ -105,7 +105,7 @@ if { $chroot == "chroot" } { | |||
105 | "Child process initialized" | 105 | "Child process initialized" |
106 | } | 106 | } |
107 | sleep 1 | 107 | sleep 1 |
108 | 108 | ||
109 | send -- "cat /proc/mounts | grep proc --color=never\r" | 109 | send -- "cat /proc/mounts | grep proc --color=never\r" |
110 | expect { | 110 | expect { |
111 | timeout {puts "TESTING ERROR 5.1\n";exit} | 111 | timeout {puts "TESTING ERROR 5.1\n";exit} |
diff --git a/test/features/1.4.exp b/test/features/1.4.exp index d6f373e2a..de05536f0 100755 --- a/test/features/1.4.exp +++ b/test/features/1.4.exp | |||
@@ -53,7 +53,7 @@ if { $overlay == "overlay" } { | |||
53 | "Child process initialized" {puts "normal system\n"} | 53 | "Child process initialized" {puts "normal system\n"} |
54 | } | 54 | } |
55 | sleep 1 | 55 | sleep 1 |
56 | 56 | ||
57 | send -- "ls -l /home | wc -l\r" | 57 | send -- "ls -l /home | wc -l\r" |
58 | expect { | 58 | expect { |
59 | timeout {puts "TESTING ERROR 3\n";exit} | 59 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -86,7 +86,7 @@ if { $chroot == "chroot" } { | |||
86 | "Child process initialized" | 86 | "Child process initialized" |
87 | } | 87 | } |
88 | sleep 1 | 88 | sleep 1 |
89 | 89 | ||
90 | send -- "ls -l /home | wc -l\r" | 90 | send -- "ls -l /home | wc -l\r" |
91 | expect { | 91 | expect { |
92 | timeout {puts "TESTING ERROR 5\n";exit} | 92 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.5.exp b/test/features/1.5.exp index a17504e74..194c7859e 100755 --- a/test/features/1.5.exp +++ b/test/features/1.5.exp | |||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | "Child process initialized" {puts "normal system\n"} | 40 | "Child process initialized" {puts "normal system\n"} |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | 43 | ||
44 | send -- "ps aux | wc -l \r" | 44 | send -- "ps aux | wc -l \r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 3\n";exit} | 46 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | "Child process initialized" | 61 | "Child process initialized" |
62 | } | 62 | } |
63 | sleep 1 | 63 | sleep 1 |
64 | 64 | ||
65 | send -- "ps aux | wc -l \r" | 65 | send -- "ps aux | wc -l \r" |
66 | expect { | 66 | expect { |
67 | timeout {puts "TESTING ERROR 5\n";exit} | 67 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.6.exp b/test/features/1.6.exp index 0db929c5a..111aca3c8 100755 --- a/test/features/1.6.exp +++ b/test/features/1.6.exp | |||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | "Child process initialized" {puts "normal system\n"} | 40 | "Child process initialized" {puts "normal system\n"} |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | 43 | ||
44 | send -- "ls -l /var/log/syslog | wc -l\r" | 44 | send -- "ls -l /var/log/syslog | wc -l\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 3\n";exit} | 46 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | "Child process initialized" | 61 | "Child process initialized" |
62 | } | 62 | } |
63 | sleep 1 | 63 | sleep 1 |
64 | 64 | ||
65 | send -- "ls -l /var/log/syslog | wc -l\r" | 65 | send -- "ls -l /var/log/syslog | wc -l\r" |
66 | expect { | 66 | expect { |
67 | timeout {puts "TESTING ERROR 5\n";exit} | 67 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.7.exp b/test/features/1.7.exp index b838c092f..dc73ae529 100755 --- a/test/features/1.7.exp +++ b/test/features/1.7.exp | |||
@@ -42,7 +42,7 @@ if { $overlay == "overlay" } { | |||
42 | "Child process initialized" {puts "normal system\n"} | 42 | "Child process initialized" {puts "normal system\n"} |
43 | } | 43 | } |
44 | sleep 1 | 44 | sleep 1 |
45 | 45 | ||
46 | send -- "ls -l /var/tmp/somefile | wc -l\r" | 46 | send -- "ls -l /var/tmp/somefile | wc -l\r" |
47 | expect { | 47 | expect { |
48 | timeout {puts "TESTING ERROR 3\n";exit} | 48 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -63,7 +63,7 @@ if { $chroot == "chroot" } { | |||
63 | "Child process initialized" | 63 | "Child process initialized" |
64 | } | 64 | } |
65 | sleep 1 | 65 | sleep 1 |
66 | 66 | ||
67 | send -- "ls -l /var/tmp/somefile | wc -l\r" | 67 | send -- "ls -l /var/tmp/somefile | wc -l\r" |
68 | expect { | 68 | expect { |
69 | timeout {puts "TESTING ERROR 5\n";exit} | 69 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/1.8.exp b/test/features/1.8.exp index 4c6d3f3dc..3bb43718e 100755 --- a/test/features/1.8.exp +++ b/test/features/1.8.exp | |||
@@ -107,7 +107,7 @@ if { $overlay == "overlay" } { | |||
107 | "Permission denied" | 107 | "Permission denied" |
108 | } | 108 | } |
109 | after 100 | 109 | after 100 |
110 | 110 | ||
111 | send -- "exit\r" | 111 | send -- "exit\r" |
112 | sleep 1 | 112 | sleep 1 |
113 | } | 113 | } |
diff --git a/test/features/2.1.exp b/test/features/2.1.exp index 074b5989b..d560d1a36 100755 --- a/test/features/2.1.exp +++ b/test/features/2.1.exp | |||
@@ -56,7 +56,7 @@ if { $overlay == "overlay" } { | |||
56 | "Child process initialized" {puts "normal system\n"} | 56 | "Child process initialized" {puts "normal system\n"} |
57 | } | 57 | } |
58 | sleep 1 | 58 | sleep 1 |
59 | 59 | ||
60 | send -- "hostname\r" | 60 | send -- "hostname\r" |
61 | expect { | 61 | expect { |
62 | timeout {puts "TESTING ERROR 3\n";exit} | 62 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -93,7 +93,7 @@ if { $chroot == "chroot" } { | |||
93 | "Child process initialized" | 93 | "Child process initialized" |
94 | } | 94 | } |
95 | sleep 1 | 95 | sleep 1 |
96 | 96 | ||
97 | send -- "hostname\r" | 97 | send -- "hostname\r" |
98 | expect { | 98 | expect { |
99 | timeout {puts "TESTING ERROR 5\n";exit} | 99 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/2.2.exp b/test/features/2.2.exp index f30ccaf79..00ed20e1f 100755 --- a/test/features/2.2.exp +++ b/test/features/2.2.exp | |||
@@ -48,7 +48,7 @@ if { $overlay == "overlay" } { | |||
48 | "Child process initialized" {puts "normal system\n"} | 48 | "Child process initialized" {puts "normal system\n"} |
49 | } | 49 | } |
50 | sleep 1 | 50 | sleep 1 |
51 | 51 | ||
52 | send -- "dig google.com\r" | 52 | send -- "dig google.com\r" |
53 | expect { | 53 | expect { |
54 | timeout {puts "TESTING ERROR 3\n";exit} | 54 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -77,7 +77,7 @@ if { $chroot == "chroot" } { | |||
77 | "Child process initialized" | 77 | "Child process initialized" |
78 | } | 78 | } |
79 | sleep 1 | 79 | sleep 1 |
80 | 80 | ||
81 | send -- "dig google.com\r" | 81 | send -- "dig google.com\r" |
82 | expect { | 82 | expect { |
83 | timeout {puts "TESTING ERROR 5\n";exit} | 83 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/2.3.exp b/test/features/2.3.exp index 63caab14c..9d3320d78 100755 --- a/test/features/2.3.exp +++ b/test/features/2.3.exp | |||
@@ -111,7 +111,7 @@ if { $overlay == "overlay" } { | |||
111 | "Child process initialized" {puts "normal system\n"} | 111 | "Child process initialized" {puts "normal system\n"} |
112 | } | 112 | } |
113 | sleep 1 | 113 | sleep 1 |
114 | 114 | ||
115 | send -- "dig google.com\r" | 115 | send -- "dig google.com\r" |
116 | expect { | 116 | expect { |
117 | timeout {puts "TESTING ERROR 3\n";exit} | 117 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -126,7 +126,7 @@ if { $overlay == "overlay" } { | |||
126 | "SERVER" | 126 | "SERVER" |
127 | } | 127 | } |
128 | after 100 | 128 | after 100 |
129 | 129 | ||
130 | send -- "/sbin/ifconfig\r" | 130 | send -- "/sbin/ifconfig\r" |
131 | expect { | 131 | expect { |
132 | timeout {puts "TESTING ERROR 3.4\n";exit} | 132 | timeout {puts "TESTING ERROR 3.4\n";exit} |
@@ -145,17 +145,17 @@ if { $overlay == "overlay" } { | |||
145 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 145 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
146 | } | 146 | } |
147 | after 100 | 147 | after 100 |
148 | 148 | ||
149 | send -- "exit\r" | 149 | send -- "exit\r" |
150 | sleep 3 | 150 | sleep 3 |
151 | 151 | ||
152 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --overlay --dns=8.8.8.8 --dns=8.8.4.4\r" | 152 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --overlay --dns=8.8.8.8 --dns=8.8.4.4\r" |
153 | expect { | 153 | expect { |
154 | timeout {puts "TESTING ERROR 2\n";exit} | 154 | timeout {puts "TESTING ERROR 2\n";exit} |
155 | "Child process initialized" | 155 | "Child process initialized" |
156 | } | 156 | } |
157 | sleep 1 | 157 | sleep 1 |
158 | 158 | ||
159 | send -- "dig google.com\r" | 159 | send -- "dig google.com\r" |
160 | expect { | 160 | expect { |
161 | timeout {puts "TESTING ERROR 3\n";exit} | 161 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -170,7 +170,7 @@ if { $overlay == "overlay" } { | |||
170 | "SERVER" | 170 | "SERVER" |
171 | } | 171 | } |
172 | after 100 | 172 | after 100 |
173 | 173 | ||
174 | send -- "/sbin/ifconfig\r" | 174 | send -- "/sbin/ifconfig\r" |
175 | expect { | 175 | expect { |
176 | timeout {puts "TESTING ERROR 3.4\n";exit} | 176 | timeout {puts "TESTING ERROR 3.4\n";exit} |
@@ -189,7 +189,7 @@ if { $overlay == "overlay" } { | |||
189 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 189 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
190 | } | 190 | } |
191 | after 100 | 191 | after 100 |
192 | 192 | ||
193 | send -- "exit\r" | 193 | send -- "exit\r" |
194 | sleep 3 | 194 | sleep 3 |
195 | } | 195 | } |
@@ -205,7 +205,7 @@ if { $chroot == "chroot" } { | |||
205 | "Child process initialized" | 205 | "Child process initialized" |
206 | } | 206 | } |
207 | sleep 1 | 207 | sleep 1 |
208 | 208 | ||
209 | send -- "dig google.com\r" | 209 | send -- "dig google.com\r" |
210 | expect { | 210 | expect { |
211 | timeout {puts "TESTING ERROR 5\n";exit} | 211 | timeout {puts "TESTING ERROR 5\n";exit} |
@@ -220,7 +220,7 @@ if { $chroot == "chroot" } { | |||
220 | "SERVER:" | 220 | "SERVER:" |
221 | } | 221 | } |
222 | after 100 | 222 | after 100 |
223 | 223 | ||
224 | send -- "/sbin/ifconfig\r" | 224 | send -- "/sbin/ifconfig\r" |
225 | expect { | 225 | expect { |
226 | timeout {puts "TESTING ERROR 5.4\n";exit} | 226 | timeout {puts "TESTING ERROR 5.4\n";exit} |
@@ -239,17 +239,17 @@ if { $chroot == "chroot" } { | |||
239 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 239 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
240 | } | 240 | } |
241 | after 100 | 241 | after 100 |
242 | 242 | ||
243 | send -- "exit\r" | 243 | send -- "exit\r" |
244 | sleep 3 | 244 | sleep 3 |
245 | 245 | ||
246 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" | 246 | send -- "firejail --noprofile --net=eth0 --ip=192.168.1.244 --chroot=/tmp/chroot --dns=8.8.8.8 --dns=8.8.4.4\r" |
247 | expect { | 247 | expect { |
248 | timeout {puts "TESTING ERROR 4\n";exit} | 248 | timeout {puts "TESTING ERROR 4\n";exit} |
249 | "Child process initialized" | 249 | "Child process initialized" |
250 | } | 250 | } |
251 | sleep 1 | 251 | sleep 1 |
252 | 252 | ||
253 | send -- "dig google.com\r" | 253 | send -- "dig google.com\r" |
254 | expect { | 254 | expect { |
255 | timeout {puts "TESTING ERROR 5\n";exit} | 255 | timeout {puts "TESTING ERROR 5\n";exit} |
@@ -264,7 +264,7 @@ if { $chroot == "chroot" } { | |||
264 | "SERVER:" | 264 | "SERVER:" |
265 | } | 265 | } |
266 | after 100 | 266 | after 100 |
267 | 267 | ||
268 | send -- "/sbin/ifconfig\r" | 268 | send -- "/sbin/ifconfig\r" |
269 | expect { | 269 | expect { |
270 | timeout {puts "TESTING ERROR 5.4\n";exit} | 270 | timeout {puts "TESTING ERROR 5.4\n";exit} |
@@ -283,7 +283,7 @@ if { $chroot == "chroot" } { | |||
283 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 283 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
284 | } | 284 | } |
285 | after 100 | 285 | after 100 |
286 | 286 | ||
287 | send -- "exit\r" | 287 | send -- "exit\r" |
288 | sleep 1 | 288 | sleep 1 |
289 | } | 289 | } |
diff --git a/test/features/2.4.exp b/test/features/2.4.exp index fed596410..6784e1add 100755 --- a/test/features/2.4.exp +++ b/test/features/2.4.exp | |||
@@ -99,15 +99,15 @@ if { $overlay == "overlay" } { | |||
99 | "Child process initialized" {puts "normal system\n"} | 99 | "Child process initialized" {puts "normal system\n"} |
100 | } | 100 | } |
101 | sleep 1 | 101 | sleep 1 |
102 | 102 | ||
103 | send -- "ping -c 3 10.10.20.1\r" | 103 | send -- "ping -c 3 10.10.20.1\r" |
104 | expect { | 104 | expect { |
105 | timeout {puts "TESTING ERROR 3\n";exit} | 105 | timeout {puts "TESTING ERROR 3\n";exit} |
106 | " packets transmitted, 3 received, 0% packet loss" | 106 | " packets transmitted, 3 received, 0% packet loss" |
107 | } | 107 | } |
108 | sleep 1 | 108 | sleep 1 |
109 | 109 | ||
110 | 110 | ||
111 | send -- "/sbin/ifconfig\r" | 111 | send -- "/sbin/ifconfig\r" |
112 | expect { | 112 | expect { |
113 | timeout {puts "TESTING ERROR 3.4\n";exit} | 113 | timeout {puts "TESTING ERROR 3.4\n";exit} |
@@ -126,25 +126,25 @@ if { $overlay == "overlay" } { | |||
126 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 126 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
127 | } | 127 | } |
128 | after 100 | 128 | after 100 |
129 | 129 | ||
130 | send -- "exit\r" | 130 | send -- "exit\r" |
131 | sleep 1 | 131 | sleep 1 |
132 | 132 | ||
133 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --overlay\r" | 133 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --overlay\r" |
134 | expect { | 134 | expect { |
135 | timeout {puts "TESTING ERROR 2\n";exit} | 135 | timeout {puts "TESTING ERROR 2\n";exit} |
136 | "Child process initialized" | 136 | "Child process initialized" |
137 | } | 137 | } |
138 | sleep 1 | 138 | sleep 1 |
139 | 139 | ||
140 | send -- "ping -c 3 10.10.20.1\r" | 140 | send -- "ping -c 3 10.10.20.1\r" |
141 | expect { | 141 | expect { |
142 | timeout {puts "TESTING ERROR 3\n";exit} | 142 | timeout {puts "TESTING ERROR 3\n";exit} |
143 | " packets transmitted, 3 received, 0% packet loss" | 143 | " packets transmitted, 3 received, 0% packet loss" |
144 | } | 144 | } |
145 | sleep 1 | 145 | sleep 1 |
146 | 146 | ||
147 | 147 | ||
148 | send -- "/sbin/ifconfig\r" | 148 | send -- "/sbin/ifconfig\r" |
149 | expect { | 149 | expect { |
150 | timeout {puts "TESTING ERROR 3.4\n";exit} | 150 | timeout {puts "TESTING ERROR 3.4\n";exit} |
@@ -163,7 +163,7 @@ if { $overlay == "overlay" } { | |||
163 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 163 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
164 | } | 164 | } |
165 | after 100 | 165 | after 100 |
166 | 166 | ||
167 | send -- "exit\r" | 167 | send -- "exit\r" |
168 | sleep 1 | 168 | sleep 1 |
169 | } | 169 | } |
@@ -179,7 +179,7 @@ if { $chroot == "chroot" } { | |||
179 | "Child process initialized" | 179 | "Child process initialized" |
180 | } | 180 | } |
181 | sleep 1 | 181 | sleep 1 |
182 | 182 | ||
183 | send -- "/sbin/ifconfig\r" | 183 | send -- "/sbin/ifconfig\r" |
184 | expect { | 184 | expect { |
185 | timeout {puts "TESTING ERROR 5.4\n";exit} | 185 | timeout {puts "TESTING ERROR 5.4\n";exit} |
@@ -198,17 +198,17 @@ if { $chroot == "chroot" } { | |||
198 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 198 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
199 | } | 199 | } |
200 | after 100 | 200 | after 100 |
201 | 201 | ||
202 | send -- "exit\r" | 202 | send -- "exit\r" |
203 | sleep 1 | 203 | sleep 1 |
204 | 204 | ||
205 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --chroot=/tmp/chroot\r" | 205 | send -- "firejail --noprofile --net=br0 --ip=10.10.20.4 --chroot=/tmp/chroot\r" |
206 | expect { | 206 | expect { |
207 | timeout {puts "TESTING ERROR 4\n";exit} | 207 | timeout {puts "TESTING ERROR 4\n";exit} |
208 | "Child process initialized" | 208 | "Child process initialized" |
209 | } | 209 | } |
210 | sleep 1 | 210 | sleep 1 |
211 | 211 | ||
212 | send -- "/sbin/ifconfig\r" | 212 | send -- "/sbin/ifconfig\r" |
213 | expect { | 213 | expect { |
214 | timeout {puts "TESTING ERROR 5.4\n";exit} | 214 | timeout {puts "TESTING ERROR 5.4\n";exit} |
@@ -227,7 +227,7 @@ if { $chroot == "chroot" } { | |||
227 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" | 227 | "UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1" |
228 | } | 228 | } |
229 | after 100 | 229 | after 100 |
230 | 230 | ||
231 | send -- "exit\r" | 231 | send -- "exit\r" |
232 | sleep 1 | 232 | sleep 1 |
233 | } | 233 | } |
diff --git a/test/features/2.5.exp b/test/features/2.5.exp index 1d6105ae8..2d4c7a9bc 100755 --- a/test/features/2.5.exp +++ b/test/features/2.5.exp | |||
@@ -51,7 +51,7 @@ if { $overlay == "overlay" } { | |||
51 | "Child process initialized" {puts "normal system\n"} | 51 | "Child process initialized" {puts "normal system\n"} |
52 | } | 52 | } |
53 | sleep 1 | 53 | sleep 1 |
54 | 54 | ||
55 | send -- "/sbin/ifconfig\r" | 55 | send -- "/sbin/ifconfig\r" |
56 | expect { | 56 | expect { |
57 | timeout {puts "TESTING ERROR 3.4\n";exit} | 57 | timeout {puts "TESTING ERROR 3.4\n";exit} |
@@ -84,7 +84,7 @@ if { $chroot == "chroot" } { | |||
84 | "Child process initialized" | 84 | "Child process initialized" |
85 | } | 85 | } |
86 | sleep 1 | 86 | sleep 1 |
87 | 87 | ||
88 | send -- "/sbin/ifconfig\r" | 88 | send -- "/sbin/ifconfig\r" |
89 | expect { | 89 | expect { |
90 | timeout {puts "TESTING ERROR 5.4\n";exit} | 90 | timeout {puts "TESTING ERROR 5.4\n";exit} |
diff --git a/test/features/2.6.exp b/test/features/2.6.exp index 596e8f435..63a9b3b90 100755 --- a/test/features/2.6.exp +++ b/test/features/2.6.exp | |||
@@ -39,7 +39,7 @@ if { $overlay == "overlay" } { | |||
39 | "Child process initialized" {puts "normal system\n"} | 39 | "Child process initialized" {puts "normal system\n"} |
40 | } | 40 | } |
41 | sleep 1 | 41 | sleep 1 |
42 | 42 | ||
43 | send -- "ip route show\r" | 43 | send -- "ip route show\r" |
44 | expect { | 44 | expect { |
45 | timeout {puts "TESTING ERROR 3\n";exit} | 45 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -60,7 +60,7 @@ if { $chroot == "chroot" } { | |||
60 | "Child process initialized" | 60 | "Child process initialized" |
61 | } | 61 | } |
62 | sleep 1 | 62 | sleep 1 |
63 | 63 | ||
64 | send -- "ip route show\r" | 64 | send -- "ip route show\r" |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 5\n";exit} | 66 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/3.1.exp b/test/features/3.1.exp index 046c703b7..3178cda42 100755 --- a/test/features/3.1.exp +++ b/test/features/3.1.exp | |||
@@ -70,13 +70,13 @@ if { $overlay == "overlay" } { | |||
70 | "Child process initialized" {puts "normal system\n"} | 70 | "Child process initialized" {puts "normal system\n"} |
71 | } | 71 | } |
72 | sleep 1 | 72 | sleep 1 |
73 | 73 | ||
74 | send -- "ls -al | wc -l\r" | 74 | send -- "ls -al | wc -l\r" |
75 | expect { | 75 | expect { |
76 | timeout {puts "TESTING ERROR 3.1\n";exit} | 76 | timeout {puts "TESTING ERROR 3.1\n";exit} |
77 | "6" | 77 | "6" |
78 | } | 78 | } |
79 | 79 | ||
80 | send -- "ls -al .bashrc\r" | 80 | send -- "ls -al .bashrc\r" |
81 | expect { | 81 | expect { |
82 | timeout {puts "TESTING ERROR 3.2\n";exit} | 82 | timeout {puts "TESTING ERROR 3.2\n";exit} |
@@ -90,7 +90,7 @@ if { $overlay == "overlay" } { | |||
90 | timeout {puts "TESTING ERROR 3.4\n";exit} | 90 | timeout {puts "TESTING ERROR 3.4\n";exit} |
91 | ".bashrc" | 91 | ".bashrc" |
92 | } | 92 | } |
93 | 93 | ||
94 | send -- "ls -al .Xauthority\r" | 94 | send -- "ls -al .Xauthority\r" |
95 | expect { | 95 | expect { |
96 | timeout {puts "TESTING ERROR 3.5\n";exit} | 96 | timeout {puts "TESTING ERROR 3.5\n";exit} |
@@ -120,13 +120,13 @@ if { $chroot == "chroot" } { | |||
120 | "Child process initialized" | 120 | "Child process initialized" |
121 | } | 121 | } |
122 | sleep 1 | 122 | sleep 1 |
123 | 123 | ||
124 | send -- "ls -al | wc -l\r" | 124 | send -- "ls -al | wc -l\r" |
125 | expect { | 125 | expect { |
126 | timeout {puts "TESTING ERROR 5.1\n";exit} | 126 | timeout {puts "TESTING ERROR 5.1\n";exit} |
127 | "5" | 127 | "5" |
128 | } | 128 | } |
129 | 129 | ||
130 | send -- "ls -al .bashrc\r" | 130 | send -- "ls -al .bashrc\r" |
131 | expect { | 131 | expect { |
132 | timeout {puts "TESTING ERROR 5.2\n";exit} | 132 | timeout {puts "TESTING ERROR 5.2\n";exit} |
@@ -140,7 +140,7 @@ if { $chroot == "chroot" } { | |||
140 | timeout {puts "TESTING ERROR 5.4\n";exit} | 140 | timeout {puts "TESTING ERROR 5.4\n";exit} |
141 | ".bashrc" | 141 | ".bashrc" |
142 | } | 142 | } |
143 | 143 | ||
144 | send -- "ls -al .Xauthority\r" | 144 | send -- "ls -al .Xauthority\r" |
145 | expect { | 145 | expect { |
146 | timeout {puts "TESTING ERROR 5.5\n";exit} | 146 | timeout {puts "TESTING ERROR 5.5\n";exit} |
@@ -154,7 +154,7 @@ if { $chroot == "chroot" } { | |||
154 | timeout {puts "TESTING ERROR 5.7\n";exit} | 154 | timeout {puts "TESTING ERROR 5.7\n";exit} |
155 | ".Xauthority" | 155 | ".Xauthority" |
156 | } | 156 | } |
157 | 157 | ||
158 | after 100 | 158 | after 100 |
159 | send -- "exit\r" | 159 | send -- "exit\r" |
160 | sleep 1 | 160 | sleep 1 |
diff --git a/test/features/3.10.exp b/test/features/3.10.exp index 4a06463a7..d6d858322 100755 --- a/test/features/3.10.exp +++ b/test/features/3.10.exp | |||
@@ -78,7 +78,7 @@ if { $overlay == "overlay" } { | |||
78 | "Child process initialized" {puts "normal system\n"} | 78 | "Child process initialized" {puts "normal system\n"} |
79 | } | 79 | } |
80 | sleep 1 | 80 | sleep 1 |
81 | 81 | ||
82 | send -- "ls -l /tmp | wc -l\r" | 82 | send -- "ls -l /tmp | wc -l\r" |
83 | expect { | 83 | expect { |
84 | timeout {puts "TESTING ERROR 3.1\n";exit} | 84 | timeout {puts "TESTING ERROR 3.1\n";exit} |
@@ -97,7 +97,7 @@ if { $overlay == "overlay" } { | |||
97 | timeout {puts "TESTING ERROR 3.4\n";exit} | 97 | timeout {puts "TESTING ERROR 3.4\n";exit} |
98 | "test1dir" | 98 | "test1dir" |
99 | } | 99 | } |
100 | 100 | ||
101 | send -- "ls -l /tmp/test1dir | wc -l\r" | 101 | send -- "ls -l /tmp/test1dir | wc -l\r" |
102 | expect { | 102 | expect { |
103 | timeout {puts "TESTING ERROR 3.5\n";exit} | 103 | timeout {puts "TESTING ERROR 3.5\n";exit} |
@@ -136,7 +136,7 @@ if { $chroot == "chroot" } { | |||
136 | "Child process initialized" | 136 | "Child process initialized" |
137 | } | 137 | } |
138 | sleep 1 | 138 | sleep 1 |
139 | 139 | ||
140 | send -- "ls -l /tmp | wc -l\r" | 140 | send -- "ls -l /tmp | wc -l\r" |
141 | expect { | 141 | expect { |
142 | timeout {puts "TESTING ERROR 5.1\n";exit} | 142 | timeout {puts "TESTING ERROR 5.1\n";exit} |
@@ -155,7 +155,7 @@ if { $chroot == "chroot" } { | |||
155 | timeout {puts "TESTING ERROR 5.4\n";exit} | 155 | timeout {puts "TESTING ERROR 5.4\n";exit} |
156 | "test1dir" | 156 | "test1dir" |
157 | } | 157 | } |
158 | 158 | ||
159 | send -- "ls -l /tmp/test1dir | wc -l\r" | 159 | send -- "ls -l /tmp/test1dir | wc -l\r" |
160 | expect { | 160 | expect { |
161 | timeout {puts "TESTING ERROR 5.5\n";exit} | 161 | timeout {puts "TESTING ERROR 5.5\n";exit} |
@@ -174,7 +174,7 @@ if { $chroot == "chroot" } { | |||
174 | timeout {puts "TESTING ERROR 5.8\n";exit} | 174 | timeout {puts "TESTING ERROR 5.8\n";exit} |
175 | "test1" | 175 | "test1" |
176 | } | 176 | } |
177 | 177 | ||
178 | after 100 | 178 | after 100 |
179 | send -- "exit\r" | 179 | send -- "exit\r" |
180 | sleep 1 | 180 | sleep 1 |
diff --git a/test/features/3.11.exp b/test/features/3.11.exp index dc41ed743..4e89aa372 100755 --- a/test/features/3.11.exp +++ b/test/features/3.11.exp | |||
@@ -65,7 +65,7 @@ sleep 1 | |||
65 | if { $overlay == "overlay" } { | 65 | if { $overlay == "overlay" } { |
66 | send -- "rm -fr ~/firejail-xy76_u9\r" | 66 | send -- "rm -fr ~/firejail-xy76_u9\r" |
67 | sleep 1 | 67 | sleep 1 |
68 | 68 | ||
69 | send -- "firejail --profile=3.11.profile\r" | 69 | send -- "firejail --profile=3.11.profile\r" |
70 | expect { | 70 | expect { |
71 | timeout {puts "TESTING ERROR 10\n";exit} | 71 | timeout {puts "TESTING ERROR 10\n";exit} |
@@ -73,7 +73,7 @@ if { $overlay == "overlay" } { | |||
73 | "Child process initialized" {puts "normal system\n"} | 73 | "Child process initialized" {puts "normal system\n"} |
74 | } | 74 | } |
75 | sleep 1 | 75 | sleep 1 |
76 | 76 | ||
77 | send -- "ls -l ~ | grep firejail-xy76_u9\r" | 77 | send -- "ls -l ~ | grep firejail-xy76_u9\r" |
78 | expect { | 78 | expect { |
79 | timeout {puts "TESTING ERROR 11\n";exit} | 79 | timeout {puts "TESTING ERROR 11\n";exit} |
@@ -89,7 +89,7 @@ if { $overlay == "overlay" } { | |||
89 | "firejail-xy76_u9" | 89 | "firejail-xy76_u9" |
90 | } | 90 | } |
91 | after 100 | 91 | after 100 |
92 | 92 | ||
93 | send -- "ls -l ~/firejail-xy76_u9\r" | 93 | send -- "ls -l ~/firejail-xy76_u9\r" |
94 | expect { | 94 | expect { |
95 | timeout {puts "TESTING ERROR 14\n";exit} | 95 | timeout {puts "TESTING ERROR 14\n";exit} |
@@ -105,7 +105,7 @@ if { $overlay == "overlay" } { | |||
105 | "testdir" | 105 | "testdir" |
106 | } | 106 | } |
107 | after 100 | 107 | after 100 |
108 | 108 | ||
109 | send -- "exit\r" | 109 | send -- "exit\r" |
110 | sleep 1 | 110 | sleep 1 |
111 | send -- "rm -fr ~/firejail-xy76_u9\r" | 111 | send -- "rm -fr ~/firejail-xy76_u9\r" |
@@ -120,14 +120,14 @@ if { $overlay == "overlay" } { | |||
120 | if { $chroot == "chroot" } { | 120 | if { $chroot == "chroot" } { |
121 | send -- "rm -fr ~/firejail-xy76_u9\r" | 121 | send -- "rm -fr ~/firejail-xy76_u9\r" |
122 | sleep 1 | 122 | sleep 1 |
123 | 123 | ||
124 | send -- "firejail --profile=3.11.profile\r" | 124 | send -- "firejail --profile=3.11.profile\r" |
125 | expect { | 125 | expect { |
126 | timeout {puts "TESTING ERROR 20\n";exit} | 126 | timeout {puts "TESTING ERROR 20\n";exit} |
127 | "Child process initialized" | 127 | "Child process initialized" |
128 | } | 128 | } |
129 | sleep 1 | 129 | sleep 1 |
130 | 130 | ||
131 | send -- "ls -l ~ | grep firejail-xy76_u9\r" | 131 | send -- "ls -l ~ | grep firejail-xy76_u9\r" |
132 | expect { | 132 | expect { |
133 | timeout {puts "TESTING ERROR 21\n";exit} | 133 | timeout {puts "TESTING ERROR 21\n";exit} |
@@ -143,7 +143,7 @@ if { $chroot == "chroot" } { | |||
143 | "firejail-xy76_u9" | 143 | "firejail-xy76_u9" |
144 | } | 144 | } |
145 | after 100 | 145 | after 100 |
146 | 146 | ||
147 | send -- "ls -l ~/firejail-xy76_u9\r" | 147 | send -- "ls -l ~/firejail-xy76_u9\r" |
148 | expect { | 148 | expect { |
149 | timeout {puts "TESTING ERROR 24\n";exit} | 149 | timeout {puts "TESTING ERROR 24\n";exit} |
@@ -159,7 +159,7 @@ if { $chroot == "chroot" } { | |||
159 | "testdir" | 159 | "testdir" |
160 | } | 160 | } |
161 | after 100 | 161 | after 100 |
162 | 162 | ||
163 | send -- "rm -fr ~/firejail-xy76_u9\r" | 163 | send -- "rm -fr ~/firejail-xy76_u9\r" |
164 | sleep 1 | 164 | sleep 1 |
165 | 165 | ||
@@ -169,4 +169,3 @@ if { $chroot == "chroot" } { | |||
169 | 169 | ||
170 | 170 | ||
171 | puts "\nall done\n" | 171 | puts "\nall done\n" |
172 | |||
diff --git a/test/features/3.2.exp b/test/features/3.2.exp index be20b1547..271bbdda1 100755 --- a/test/features/3.2.exp +++ b/test/features/3.2.exp | |||
@@ -41,7 +41,7 @@ if { $overlay == "overlay" } { | |||
41 | "Child process initialized" {puts "normal system\n"} | 41 | "Child process initialized" {puts "normal system\n"} |
42 | } | 42 | } |
43 | sleep 1 | 43 | sleep 1 |
44 | 44 | ||
45 | send -- "touch ~/.config/firejail-test-file\r" | 45 | send -- "touch ~/.config/firejail-test-file\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 3\n";exit} | 47 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -64,7 +64,7 @@ if { $chroot == "chroot" } { | |||
64 | "Child process initialized" | 64 | "Child process initialized" |
65 | } | 65 | } |
66 | sleep 1 | 66 | sleep 1 |
67 | 67 | ||
68 | send -- "touch ~/.config/firejail-test-file\r" | 68 | send -- "touch ~/.config/firejail-test-file\r" |
69 | expect { | 69 | expect { |
70 | timeout {puts "TESTING ERROR 5\n";exit} | 70 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/3.3.exp b/test/features/3.3.exp index bb2c34dc1..c662410dc 100755 --- a/test/features/3.3.exp +++ b/test/features/3.3.exp | |||
@@ -40,7 +40,7 @@ if { $overlay == "overlay" } { | |||
40 | "Child process initialized" {puts "normal system\n"} | 40 | "Child process initialized" {puts "normal system\n"} |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | 43 | ||
44 | send -- "cd ~/.config\r" | 44 | send -- "cd ~/.config\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 3\n";exit} | 46 | timeout {puts "TESTING ERROR 3\n";exit} |
@@ -61,7 +61,7 @@ if { $chroot == "chroot" } { | |||
61 | "Child process initialized" | 61 | "Child process initialized" |
62 | } | 62 | } |
63 | sleep 1 | 63 | sleep 1 |
64 | 64 | ||
65 | send -- "cd ~/.config\r" | 65 | send -- "cd ~/.config\r" |
66 | expect { | 66 | expect { |
67 | timeout {puts "TESTING ERROR 5\n";exit} | 67 | timeout {puts "TESTING ERROR 5\n";exit} |
diff --git a/test/features/3.4.exp b/test/features/3.4.exp index 7ed439669..2e0f7cae7 100755 --- a/test/features/3.4.exp +++ b/test/features/3.4.exp | |||
@@ -83,13 +83,13 @@ if { $overlay == "overlay" } { | |||
83 | "Child process initialized" {puts "normal system\n"} | 83 | "Child process initialized" {puts "normal system\n"} |
84 | } | 84 | } |
85 | sleep 1 | 85 | sleep 1 |
86 | 86 | ||
87 | send -- "ls -al | wc -l\r" | 87 | send -- "ls -al | wc -l\r" |
88 | expect { | 88 | expect { |
89 | timeout {puts "TESTING ERROR 3.1\n";exit} | 89 | timeout {puts "TESTING ERROR 3.1\n";exit} |
90 | "6" | 90 | "6" |
91 | } | 91 | } |
92 | 92 | ||
93 | send -- "ls -al .bashrc\r" | 93 | send -- "ls -al .bashrc\r" |
94 | expect { | 94 | expect { |
95 | timeout {puts "TESTING ERROR 3.2\n";exit} | 95 | timeout {puts "TESTING ERROR 3.2\n";exit} |
@@ -117,7 +117,7 @@ if { $overlay == "overlay" } { | |||
117 | timeout {puts "TESTING ERROR 3.7\n";exit} | 117 | timeout {puts "TESTING ERROR 3.7\n";exit} |
118 | ".Xauthority" | 118 | ".Xauthority" |
119 | } | 119 | } |
120 | 120 | ||
121 | send -- "ls -al | grep .config\r" | 121 | send -- "ls -al | grep .config\r" |
122 | expect { | 122 | expect { |
123 | timeout {puts "TESTING ERROR 3.8\n";exit} | 123 | timeout {puts "TESTING ERROR 3.8\n";exit} |
@@ -147,13 +147,13 @@ if { $chroot == "chroot" } { | |||
147 | "Child process initialized" | 147 | "Child process initialized" |
148 | } | 148 | } |
149 | sleep 1 | 149 | sleep 1 |
150 | 150 | ||
151 | send -- "ls -al | wc -l\r" | 151 | send -- "ls -al | wc -l\r" |
152 | expect { | 152 | expect { |
153 | timeout {puts "TESTING ERROR 5.1\n";exit} | 153 | timeout {puts "TESTING ERROR 5.1\n";exit} |
154 | "6" | 154 | "6" |
155 | } | 155 | } |
156 | 156 | ||
157 | send -- "ls -al .bashrc\r" | 157 | send -- "ls -al .bashrc\r" |
158 | expect { | 158 | expect { |
159 | timeout {puts "TESTING ERROR 5.2\n";exit} | 159 | timeout {puts "TESTING ERROR 5.2\n";exit} |
@@ -181,7 +181,7 @@ if { $chroot == "chroot" } { | |||
181 | timeout {puts "TESTING ERROR 5.7\n";exit} | 181 | timeout {puts "TESTING ERROR 5.7\n";exit} |
182 | ".Xauthority" | 182 | ".Xauthority" |
183 | } | 183 | } |
184 | 184 | ||
185 | send -- "ls -al | grep .config\r" | 185 | send -- "ls -al | grep .config\r" |
186 | expect { | 186 | expect { |
187 | timeout {puts "TESTING ERROR 5.8\n";exit} | 187 | timeout {puts "TESTING ERROR 5.8\n";exit} |
diff --git a/test/features/3.5.exp b/test/features/3.5.exp index f4b544b3d..abaf42a0e 100755 --- a/test/features/3.5.exp +++ b/test/features/3.5.exp | |||
@@ -41,14 +41,14 @@ if { $overlay == "overlay" } { | |||
41 | "Child process initialized" {puts "normal system\n"} | 41 | "Child process initialized" {puts "normal system\n"} |
42 | } | 42 | } |
43 | sleep 1 | 43 | sleep 1 |
44 | 44 | ||
45 | send -- "ls -l /dev | wc -l\r" | 45 | send -- "ls -l /dev | wc -l\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 3.1\n";exit} | 47 | timeout {puts "TESTING ERROR 3.1\n";exit} |
48 | "13" { puts "Debian\n"} | 48 | "13" { puts "Debian\n"} |
49 | "12" { puts "Centos\n"} | 49 | "12" { puts "Centos\n"} |
50 | } | 50 | } |
51 | 51 | ||
52 | after 100 | 52 | after 100 |
53 | send -- "exit\r" | 53 | send -- "exit\r" |
54 | sleep 1 | 54 | sleep 1 |
@@ -64,13 +64,13 @@ if { $chroot == "chroot" } { | |||
64 | "Child process initialized" | 64 | "Child process initialized" |
65 | } | 65 | } |
66 | sleep 1 | 66 | sleep 1 |
67 | 67 | ||
68 | send -- "ls -l /dev | wc -l\r" | 68 | send -- "ls -l /dev | wc -l\r" |
69 | expect { | 69 | expect { |
70 | timeout {puts "TESTING ERROR 5.1\n";exit} | 70 | timeout {puts "TESTING ERROR 5.1\n";exit} |
71 | "12" | 71 | "12" |
72 | } | 72 | } |
73 | 73 | ||
74 | after 100 | 74 | after 100 |
75 | send -- "exit\r" | 75 | send -- "exit\r" |
76 | sleep 1 | 76 | sleep 1 |
diff --git a/test/features/3.6.exp b/test/features/3.6.exp index 389e63a1d..043a24121 100755 --- a/test/features/3.6.exp +++ b/test/features/3.6.exp | |||
@@ -40,13 +40,13 @@ if { $overlay == "overlay" } { | |||
40 | "Child process initialized" {puts "normal system\n"} | 40 | "Child process initialized" {puts "normal system\n"} |
41 | } | 41 | } |
42 | sleep 1 | 42 | sleep 1 |
43 | 43 | ||
44 | send -- "ls -al /etc | wc -l\r" | 44 | send -- "ls -al /etc | wc -l\r" |
45 | expect { | 45 | expect { |
46 | timeout {puts "TESTING ERROR 3.1\n";exit} | 46 | timeout {puts "TESTING ERROR 3.1\n";exit} |
47 | "10" | 47 | "10" |
48 | } | 48 | } |
49 | 49 | ||
50 | after 100 | 50 | after 100 |
51 | send -- "exit\r" | 51 | send -- "exit\r" |
52 | sleep 1 | 52 | sleep 1 |
@@ -68,13 +68,13 @@ if { $chroot == "chroot" } { | |||
68 | "Child process initialized" | 68 | "Child process initialized" |
69 | } | 69 | } |
70 | sleep 1 | 70 | sleep 1 |
71 | 71 | ||
72 | send -- "ls /etc | grep firejail\r" | 72 | send -- "ls /etc | grep firejail\r" |
73 | expect { | 73 | expect { |
74 | timeout {puts "TESTING ERROR 6\n";exit} | 74 | timeout {puts "TESTING ERROR 6\n";exit} |
75 | "firejail" | 75 | "firejail" |
76 | } | 76 | } |
77 | 77 | ||
78 | after 100 | 78 | after 100 |
79 | send -- "exit\r" | 79 | send -- "exit\r" |
80 | sleep 1 | 80 | sleep 1 |
diff --git a/test/features/3.7.exp b/test/features/3.7.exp index 2a9ce84d6..bcd50c389 100755 --- a/test/features/3.7.exp +++ b/test/features/3.7.exp | |||
@@ -49,13 +49,13 @@ if { $overlay == "overlay" } { | |||
49 | "Child process initialized" {puts "normal system\n"} | 49 | "Child process initialized" {puts "normal system\n"} |
50 | } | 50 | } |
51 | sleep 1 | 51 | sleep 1 |
52 | 52 | ||
53 | send -- "ls -al /tmp | wc -l\r" | 53 | send -- "ls -al /tmp | wc -l\r" |
54 | expect { | 54 | expect { |
55 | timeout {puts "TESTING ERROR 3.1\n";exit} | 55 | timeout {puts "TESTING ERROR 3.1\n";exit} |
56 | "3" | 56 | "3" |
57 | } | 57 | } |
58 | 58 | ||
59 | 59 | ||
60 | after 100 | 60 | after 100 |
61 | send -- "exit\r" | 61 | send -- "exit\r" |
@@ -76,13 +76,13 @@ if { $chroot == "chroot" } { | |||
76 | "Child process initialized" | 76 | "Child process initialized" |
77 | } | 77 | } |
78 | sleep 1 | 78 | sleep 1 |
79 | 79 | ||
80 | send -- "ls -al /tmp | wc -l\r" | 80 | send -- "ls -al /tmp | wc -l\r" |
81 | expect { | 81 | expect { |
82 | timeout {puts "TESTING ERROR 5.1\n";exit} | 82 | timeout {puts "TESTING ERROR 5.1\n";exit} |
83 | "3" | 83 | "3" |
84 | } | 84 | } |
85 | 85 | ||
86 | after 100 | 86 | after 100 |
87 | send -- "exit\r" | 87 | send -- "exit\r" |
88 | sleep 1 | 88 | sleep 1 |
diff --git a/test/features/3.8.exp b/test/features/3.8.exp index d941fa9b7..4497b9f19 100755 --- a/test/features/3.8.exp +++ b/test/features/3.8.exp | |||
@@ -41,13 +41,13 @@ if { $overlay == "overlay" } { | |||
41 | "Child process initialized" {puts "normal system\n"} | 41 | "Child process initialized" {puts "normal system\n"} |
42 | } | 42 | } |
43 | sleep 1 | 43 | sleep 1 |
44 | 44 | ||
45 | send -- "ls -l /usr/bin | wc -l\r" | 45 | send -- "ls -l /usr/bin | wc -l\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 3.1\n";exit} | 47 | timeout {puts "TESTING ERROR 3.1\n";exit} |
48 | "6" | 48 | "6" |
49 | } | 49 | } |
50 | 50 | ||
51 | 51 | ||
52 | after 100 | 52 | after 100 |
53 | send -- "exit\r" | 53 | send -- "exit\r" |
@@ -68,13 +68,13 @@ if { $chroot == "chroot" } { | |||
68 | "Child process initialized" | 68 | "Child process initialized" |
69 | } | 69 | } |
70 | sleep 1 | 70 | sleep 1 |
71 | 71 | ||
72 | send -- "ls -l /usr/bin | wc -l\r" | 72 | send -- "ls -l /usr/bin | wc -l\r" |
73 | expect { | 73 | expect { |
74 | timeout {puts "TESTING ERROR 6\n";exit} | 74 | timeout {puts "TESTING ERROR 6\n";exit} |
75 | "9" | 75 | "9" |
76 | } | 76 | } |
77 | 77 | ||
78 | after 100 | 78 | after 100 |
79 | send -- "exit\r" | 79 | send -- "exit\r" |
80 | sleep 1 | 80 | sleep 1 |
diff --git a/test/features/3.9.exp b/test/features/3.9.exp index 660ccbe05..e6cefa0f6 100755 --- a/test/features/3.9.exp +++ b/test/features/3.9.exp | |||
@@ -42,13 +42,13 @@ if { $overlay == "overlay" } { | |||
42 | "Child process initialized" {puts "normal system\n"} | 42 | "Child process initialized" {puts "normal system\n"} |
43 | } | 43 | } |
44 | sleep 1 | 44 | sleep 1 |
45 | 45 | ||
46 | send -- "ls -l /dev | wc -l\r" | 46 | send -- "ls -l /dev | wc -l\r" |
47 | expect { | 47 | expect { |
48 | timeout {puts "TESTING ERROR 3.1\n";exit} | 48 | timeout {puts "TESTING ERROR 3.1\n";exit} |
49 | "3" | 49 | "3" |
50 | } | 50 | } |
51 | 51 | ||
52 | 52 | ||
53 | after 100 | 53 | after 100 |
54 | send -- "exit\r" | 54 | send -- "exit\r" |
@@ -65,13 +65,13 @@ if { $chroot == "chroot" } { | |||
65 | "Child process initialized" | 65 | "Child process initialized" |
66 | } | 66 | } |
67 | sleep 1 | 67 | sleep 1 |
68 | 68 | ||
69 | send -- "ls -l /dev | wc -l\r" | 69 | send -- "ls -l /dev | wc -l\r" |
70 | expect { | 70 | expect { |
71 | timeout {puts "TESTING ERROR 5.1\n";exit} | 71 | timeout {puts "TESTING ERROR 5.1\n";exit} |
72 | "3" | 72 | "3" |
73 | } | 73 | } |
74 | 74 | ||
75 | after 100 | 75 | after 100 |
76 | send -- "exit\r" | 76 | send -- "exit\r" |
77 | sleep 1 | 77 | sleep 1 |
diff --git a/test/features/features.txt b/test/features/features.txt index b793257c3..904803234 100644 --- a/test/features/features.txt +++ b/test/features/features.txt | |||
@@ -59,7 +59,3 @@ C - chroot filesystem | |||
59 | 3.10 whitelist tmp | 59 | 3.10 whitelist tmp |
60 | - O not working on Arch Linux - todo | 60 | - O not working on Arch Linux - todo |
61 | 3.11 mkdir | 61 | 3.11 mkdir |
62 | |||
63 | |||
64 | |||
65 | |||
diff --git a/test/features/test.sh b/test/features/test.sh index f28da37d5..cf62d0a3d 100755 --- a/test/features/test.sh +++ b/test/features/test.sh | |||
@@ -115,4 +115,3 @@ echo "TESTING: 3.10 whitelist tmp" | |||
115 | 115 | ||
116 | echo "TESTING: 3.11 mkdir" | 116 | echo "TESTING: 3.11 mkdir" |
117 | ./3.11.exp $OVERLAY $CHROOT | 117 | ./3.11.exp $OVERLAY $CHROOT |
118 | |||
diff --git a/test/filters/caps2.profile b/test/filters/caps2.profile index 4f0016fad..ad49719f1 100644 --- a/test/filters/caps2.profile +++ b/test/filters/caps2.profile | |||
@@ -1 +1 @@ | |||
caps.drop chown,dac_override,dac_read_search,fowner \ No newline at end of file | caps.drop chown,dac_override,dac_read_search,fowner | ||
diff --git a/test/filters/caps3.profile b/test/filters/caps3.profile index 4f0016fad..ad49719f1 100644 --- a/test/filters/caps3.profile +++ b/test/filters/caps3.profile | |||
@@ -1 +1 @@ | |||
caps.drop chown,dac_override,dac_read_search,fowner \ No newline at end of file | caps.drop chown,dac_override,dac_read_search,fowner | ||
diff --git a/test/filters/fseccomp.exp b/test/filters/fseccomp.exp index 433524680..95b7bfadd 100755 --- a/test/filters/fseccomp.exp +++ b/test/filters/fseccomp.exp | |||
@@ -135,4 +135,3 @@ expect { | |||
135 | 135 | ||
136 | after 100 | 136 | after 100 |
137 | puts "\nall done\n" | 137 | puts "\nall done\n" |
138 | |||
diff --git a/test/filters/seccomp-bad-empty.exp b/test/filters/seccomp-bad-empty.exp index 9cfbac109..19e64ee84 100755 --- a/test/filters/seccomp-bad-empty.exp +++ b/test/filters/seccomp-bad-empty.exp | |||
@@ -38,4 +38,3 @@ expect { | |||
38 | } | 38 | } |
39 | after 100 | 39 | after 100 |
40 | puts "\nall done\n" | 40 | puts "\nall done\n" |
41 | |||
diff --git a/test/filters/seccomp-empty.exp b/test/filters/seccomp-empty.exp index 2cd316953..03e081b34 100755 --- a/test/filters/seccomp-empty.exp +++ b/test/filters/seccomp-empty.exp | |||
@@ -146,4 +146,3 @@ sleep 2 | |||
146 | send -- "exit\r" | 146 | send -- "exit\r" |
147 | after 100 | 147 | after 100 |
148 | puts "\n" | 148 | puts "\n" |
149 | |||
diff --git a/test/filters/syscall_test b/test/filters/syscall_test index bf29c5b99..12edd2d64 100755 --- a/test/filters/syscall_test +++ b/test/filters/syscall_test | |||
Binary files differ | |||
diff --git a/test/filters/syscall_test.c b/test/filters/syscall_test.c index 48e8f29f5..641eb0c00 100644 --- a/test/filters/syscall_test.c +++ b/test/filters/syscall_test.c | |||
@@ -45,14 +45,14 @@ int main(int argc, char **argv) { | |||
45 | } | 45 | } |
46 | else | 46 | else |
47 | close(sock); | 47 | close(sock); |
48 | 48 | ||
49 | printf("testing socket AF_UNIX\n"); | 49 | printf("testing socket AF_UNIX\n"); |
50 | if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { | 50 | if ((sock = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { |
51 | perror("socket"); | 51 | perror("socket"); |
52 | } | 52 | } |
53 | else | 53 | else |
54 | close(sock); | 54 | close(sock); |
55 | 55 | ||
56 | // root needed to be able to handle this | 56 | // root needed to be able to handle this |
57 | printf("testing socket AF_PACKETX\n"); | 57 | printf("testing socket AF_PACKETX\n"); |
58 | if ((sock = socket(AF_PACKET, SOCK_DGRAM, htons(ETH_P_ARP))) < 0) { | 58 | if ((sock = socket(AF_PACKET, SOCK_DGRAM, htons(ETH_P_ARP))) < 0) { |
diff --git a/test/filters/syscall_test32 b/test/filters/syscall_test32 index 8d72f58c4..29af1e073 100755 --- a/test/filters/syscall_test32 +++ b/test/filters/syscall_test32 | |||
Binary files differ | |||
diff --git a/test/firemon-cgroup.exp b/test/firemon-cgroup.exp index 41a38b3b6..482905bb3 100755 --- a/test/firemon-cgroup.exp +++ b/test/firemon-cgroup.exp | |||
@@ -37,4 +37,3 @@ expect { | |||
37 | sleep 1 | 37 | sleep 1 |
38 | 38 | ||
39 | puts "\n" | 39 | puts "\n" |
40 | |||
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 | |||
diff --git a/test/fs_chroot_asroot.exp b/test/fs_chroot_asroot.exp index 6c27bf1db..000ce96f7 100755 --- a/test/fs_chroot_asroot.exp +++ b/test/fs_chroot_asroot.exp | |||
@@ -88,4 +88,3 @@ sleep 1 | |||
88 | 88 | ||
89 | 89 | ||
90 | puts "all done\n" | 90 | puts "all done\n" |
91 | |||
diff --git a/test/fs_home_sanitize.exp b/test/fs_home_sanitize.exp index 300babd1c..d661f9c7b 100755 --- a/test/fs_home_sanitize.exp +++ b/test/fs_home_sanitize.exp | |||
@@ -30,4 +30,3 @@ expect { | |||
30 | sleep 1 | 30 | sleep 1 |
31 | 31 | ||
32 | puts "\n" | 32 | puts "\n" |
33 | |||
diff --git a/test/fs_sys.exp b/test/fs_sys.exp index 69f080460..05023994c 100755 --- a/test/fs_sys.exp +++ b/test/fs_sys.exp | |||
@@ -31,4 +31,3 @@ expect { | |||
31 | sleep 1 | 31 | sleep 1 |
32 | 32 | ||
33 | puts "\n" | 33 | puts "\n" |
34 | |||
diff --git a/test/fscheck-blacklist.exp b/test/fscheck-blacklist.exp index 5b6a9623c..c71d1fdfd 100755 --- a/test/fscheck-blacklist.exp +++ b/test/fscheck-blacklist.exp | |||
@@ -11,4 +11,3 @@ expect { | |||
11 | "Error" | 11 | "Error" |
12 | } | 12 | } |
13 | after 100 | 13 | after 100 |
14 | |||
diff --git a/test/fscheck-chroot.exp b/test/fscheck-chroot.exp index 208ca6a43..00013e462 100755 --- a/test/fscheck-chroot.exp +++ b/test/fscheck-chroot.exp | |||
@@ -44,7 +44,7 @@ expect { | |||
44 | } | 44 | } |
45 | after 100 | 45 | after 100 |
46 | 46 | ||
47 | # file | 47 | # file |
48 | send -- "firejail --net=br0 --chroot=fscheck-file\r" | 48 | send -- "firejail --net=br0 --chroot=fscheck-file\r" |
49 | expect { | 49 | expect { |
50 | timeout {puts "TESTING ERROR 2.1\n";exit} | 50 | timeout {puts "TESTING ERROR 2.1\n";exit} |
diff --git a/test/fscheck-privatekeep.exp b/test/fscheck-privatekeep.exp index cda9408ed..6cbf98d96 100755 --- a/test/fscheck-privatekeep.exp +++ b/test/fscheck-privatekeep.exp | |||
@@ -44,7 +44,7 @@ expect { | |||
44 | } | 44 | } |
45 | after 100 | 45 | after 100 |
46 | 46 | ||
47 | # file | 47 | # file |
48 | #send -- "firejail --net=br0 --private-home=fscheck-file\r" | 48 | #send -- "firejail --net=br0 --private-home=fscheck-file\r" |
49 | #expect { | 49 | #expect { |
50 | # timeout {puts "TESTING ERROR 2.1\n";exit} | 50 | # timeout {puts "TESTING ERROR 2.1\n";exit} |
diff --git a/test/fscheck.sh b/test/fscheck.sh index 25756d5be..009f33043 100755 --- a/test/fscheck.sh +++ b/test/fscheck.sh | |||
@@ -31,9 +31,9 @@ echo "TESTING: fscheck blacklist" | |||
31 | ./fscheck-blacklist.exp | 31 | ./fscheck-blacklist.exp |
32 | 32 | ||
33 | 33 | ||
34 | rm -fr fscheck-dir | 34 | rm -fr fscheck-dir |
35 | rm -fr fscheck-dir-link | 35 | rm -fr fscheck-dir-link |
36 | rm -fr fscheck-file-link | 36 | rm -fr fscheck-file-link |
37 | rm -fr fscheck-file | 37 | rm -fr fscheck-file |
38 | rm -fr fscheck-file-hard1 | 38 | rm -fr fscheck-file-hard1 |
39 | rm -fr fscheck-file-hard2 | 39 | rm -fr fscheck-file-hard2 |
diff --git a/test/login_ssh.exp b/test/login_ssh.exp index 23c775763..db0721d25 100755 --- a/test/login_ssh.exp +++ b/test/login_ssh.exp | |||
@@ -17,7 +17,7 @@ expect { | |||
17 | set pass $expect_out(1,string) | 17 | set pass $expect_out(1,string) |
18 | send -- "$pass\r" | 18 | send -- "$pass\r" |
19 | puts "TESTING: password sent to the server" | 19 | puts "TESTING: password sent to the server" |
20 | } | 20 | } |
21 | "Child process initialized" | 21 | "Child process initialized" |
22 | } | 22 | } |
23 | sleep 1 | 23 | sleep 1 |
diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp index e84ec719c..88b06ee3d 100755 --- a/test/network/4bridges_arp.exp +++ b/test/network/4bridges_arp.exp | |||
@@ -175,4 +175,3 @@ send -- "exit\r" | |||
175 | after 100 | 175 | after 100 |
176 | 176 | ||
177 | puts "\nall done\n" | 177 | puts "\nall done\n" |
178 | |||
diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp index 74a1e5d68..5ecf3ecb8 100755 --- a/test/network/4bridges_ip.exp +++ b/test/network/4bridges_ip.exp | |||
@@ -179,4 +179,3 @@ send -- "exit\r" | |||
179 | after 100 | 179 | after 100 |
180 | 180 | ||
181 | puts "\nall done\n" | 181 | puts "\nall done\n" |
182 | |||
diff --git a/test/network/configure b/test/network/configure index d4511c705..9d47fe69e 100755 --- a/test/network/configure +++ b/test/network/configure | |||
@@ -9,7 +9,7 @@ ifconfig br0 10.10.20.1/29 up | |||
9 | iptables -t nat -A POSTROUTING -o eth0 -s 10.10.20.0/29 -j MASQUERADE | 9 | iptables -t nat -A POSTROUTING -o eth0 -s 10.10.20.0/29 -j MASQUERADE |
10 | # port forwarding | 10 | # port forwarding |
11 | # iptables -t nat -A PREROUTING -p tcp --dport 80 -j DNAT --to 10.10.20.2:80 | 11 | # iptables -t nat -A PREROUTING -p tcp --dport 80 -j DNAT --to 10.10.20.2:80 |
12 | 12 | ||
13 | brctl addbr br1 | 13 | brctl addbr br1 |
14 | ifconfig br1 10.10.30.1/24 up | 14 | ifconfig br1 10.10.30.1/24 up |
15 | brctl addbr br2 | 15 | brctl addbr br2 |
@@ -27,4 +27,3 @@ ip link add link eth0 name eth0.7 type vlan id 7 | |||
27 | 27 | ||
28 | # network namespace | 28 | # network namespace |
29 | ip netns add red | 29 | ip netns add red |
30 | |||
diff --git a/test/network/firemon-interfaces.exp b/test/network/firemon-interfaces.exp index 7a95ccb18..f70d64dce 100755 --- a/test/network/firemon-interfaces.exp +++ b/test/network/firemon-interfaces.exp | |||
@@ -64,4 +64,3 @@ expect { | |||
64 | after 100 | 64 | after 100 |
65 | 65 | ||
66 | puts "\n" | 66 | puts "\n" |
67 | |||
diff --git a/test/network/ip6.exp b/test/network/ip6.exp index d03cb7c37..26780e167 100755 --- a/test/network/ip6.exp +++ b/test/network/ip6.exp | |||
@@ -86,4 +86,3 @@ send -- "exit\r" | |||
86 | after 100 | 86 | after 100 |
87 | 87 | ||
88 | puts "\nall done\n" | 88 | puts "\nall done\n" |
89 | |||
diff --git a/test/network/iprange.exp b/test/network/iprange.exp index d37a44e4f..c8a96b560 100755 --- a/test/network/iprange.exp +++ b/test/network/iprange.exp | |||
@@ -100,4 +100,3 @@ after 100 | |||
100 | after 100 | 100 | after 100 |
101 | 101 | ||
102 | puts "\nall done\n" | 102 | puts "\nall done\n" |
103 | |||
diff --git a/test/network/net-profile.profile b/test/network/net-profile.profile index 05052b6dc..89e431939 100644 --- a/test/network/net-profile.profile +++ b/test/network/net-profile.profile | |||
@@ -7,4 +7,3 @@ net br2 | |||
7 | ip 10.10.40.100 | 7 | ip 10.10.40.100 |
8 | net br3 | 8 | net br3 |
9 | defaultgw 10.10.20.2 | 9 | defaultgw 10.10.20.2 |
10 | |||
diff --git a/test/network/net_badip.exp b/test/network/net_badip.exp index 2467b3ef2..54f1858ca 100755 --- a/test/network/net_badip.exp +++ b/test/network/net_badip.exp | |||
@@ -16,4 +16,3 @@ expect { | |||
16 | after 100 | 16 | after 100 |
17 | 17 | ||
18 | puts "\n" | 18 | puts "\n" |
19 | |||
diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp index 763eee38e..1eee2c252 100755 --- a/test/network/net_defaultgw.exp +++ b/test/network/net_defaultgw.exp | |||
@@ -48,4 +48,3 @@ send -- "exit\r" | |||
48 | after 100 | 48 | after 100 |
49 | 49 | ||
50 | puts "\nall done\n" | 50 | puts "\nall done\n" |
51 | |||
diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp index e7483c921..58f8f9edd 100755 --- a/test/network/net_defaultgw2.exp +++ b/test/network/net_defaultgw2.exp | |||
@@ -43,4 +43,3 @@ send -- "exit\r" | |||
43 | after 100 | 43 | after 100 |
44 | 44 | ||
45 | puts "\nall done\n" | 45 | puts "\nall done\n" |
46 | |||
diff --git a/test/network/net_defaultgw3.exp b/test/network/net_defaultgw3.exp index bf5d00b34..7762e98d6 100755 --- a/test/network/net_defaultgw3.exp +++ b/test/network/net_defaultgw3.exp | |||
@@ -18,4 +18,3 @@ after 100 | |||
18 | 18 | ||
19 | 19 | ||
20 | puts "\n" | 20 | puts "\n" |
21 | |||
diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp index 8ec676dd1..a8cf08a86 100755 --- a/test/network/net_ip.exp +++ b/test/network/net_ip.exp | |||
@@ -74,4 +74,3 @@ send -- "exit\r" | |||
74 | after 100 | 74 | after 100 |
75 | 75 | ||
76 | puts "\n" | 76 | puts "\n" |
77 | |||
diff --git a/test/network/net_local.exp b/test/network/net_local.exp index 4e0cef329..b724ce5d4 100755 --- a/test/network/net_local.exp +++ b/test/network/net_local.exp | |||
@@ -47,4 +47,3 @@ send -- "exit\r" | |||
47 | after 100 | 47 | after 100 |
48 | 48 | ||
49 | puts "all done\n" | 49 | puts "all done\n" |
50 | |||
diff --git a/test/network/net_mac.exp b/test/network/net_mac.exp index dd3391d8e..d2aa19503 100755 --- a/test/network/net_mac.exp +++ b/test/network/net_mac.exp | |||
@@ -37,4 +37,3 @@ send -- "exit\r" | |||
37 | after 100 | 37 | after 100 |
38 | 38 | ||
39 | puts "\nall done\n" | 39 | puts "\nall done\n" |
40 | |||
diff --git a/test/network/net_macvlan2.exp b/test/network/net_macvlan2.exp index b6cab7c7b..334eb448e 100755 --- a/test/network/net_macvlan2.exp +++ b/test/network/net_macvlan2.exp | |||
@@ -40,4 +40,3 @@ sleep 1 | |||
40 | after 100 | 40 | after 100 |
41 | 41 | ||
42 | puts "\nall done\n" | 42 | puts "\nall done\n" |
43 | |||
diff --git a/test/network/net_mtu.exp b/test/network/net_mtu.exp index 6748d9ec5..9436f5cc5 100755 --- a/test/network/net_mtu.exp +++ b/test/network/net_mtu.exp | |||
@@ -32,4 +32,3 @@ send -- "exit\r" | |||
32 | after 100 | 32 | after 100 |
33 | 33 | ||
34 | puts "\nall done\n" | 34 | puts "\nall done\n" |
35 | |||
diff --git a/test/network/net_netfilter.exp b/test/network/net_netfilter.exp index 3c43a481f..52fd3bf11 100755 --- a/test/network/net_netfilter.exp +++ b/test/network/net_netfilter.exp | |||
@@ -88,4 +88,3 @@ send -- "exit\r" | |||
88 | after 100 | 88 | after 100 |
89 | 89 | ||
90 | puts "all done\n" | 90 | puts "all done\n" |
91 | |||
diff --git a/test/network/net_noip.exp b/test/network/net_noip.exp index dfe0abb66..9a73f618a 100755 --- a/test/network/net_noip.exp +++ b/test/network/net_noip.exp | |||
@@ -42,4 +42,3 @@ send -- "exit\r" | |||
42 | after 100 | 42 | after 100 |
43 | 43 | ||
44 | puts "all done\n" | 44 | puts "all done\n" |
45 | |||
diff --git a/test/network/net_noip2.exp b/test/network/net_noip2.exp index b6f725523..c01f2e4f4 100755 --- a/test/network/net_noip2.exp +++ b/test/network/net_noip2.exp | |||
@@ -42,4 +42,3 @@ send -- "exit\r" | |||
42 | after 100 | 42 | after 100 |
43 | 43 | ||
44 | puts "all done\n" | 44 | puts "all done\n" |
45 | |||
diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp index b3bc9b441..801fc4dfa 100755 --- a/test/network/net_profile.exp +++ b/test/network/net_profile.exp | |||
@@ -76,4 +76,3 @@ send -- "exit\r" | |||
76 | after 100 | 76 | after 100 |
77 | 77 | ||
78 | puts "\nall done\n" | 78 | puts "\nall done\n" |
79 | |||
diff --git a/test/network/net_scan.exp b/test/network/net_scan.exp index bb46f9c60..84893cf9c 100755 --- a/test/network/net_scan.exp +++ b/test/network/net_scan.exp | |||
@@ -7,7 +7,7 @@ set timeout 10 | |||
7 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
8 | match_max 100000 | 8 | match_max 100000 |
9 | 9 | ||
10 | # | 10 | # |
11 | send -- "firejail --net=br1 --ip=10.10.30.50\r" | 11 | send -- "firejail --net=br1 --ip=10.10.30.50\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
@@ -72,4 +72,3 @@ sleep 1 | |||
72 | after 100 | 72 | after 100 |
73 | 73 | ||
74 | puts "\nall done\n" | 74 | puts "\nall done\n" |
75 | |||
diff --git a/test/network/net_veth.exp b/test/network/net_veth.exp index e31f5da55..62e41fcfc 100755 --- a/test/network/net_veth.exp +++ b/test/network/net_veth.exp | |||
@@ -139,4 +139,3 @@ expect { | |||
139 | after 100 | 139 | after 100 |
140 | 140 | ||
141 | puts "\n" | 141 | puts "\n" |
142 | |||
diff --git a/test/network/netstats.exp b/test/network/netstats.exp index 2e6649ae3..e9ca4e027 100755 --- a/test/network/netstats.exp +++ b/test/network/netstats.exp | |||
@@ -36,4 +36,3 @@ expect { | |||
36 | after 100 | 36 | after 100 |
37 | 37 | ||
38 | puts "\n" | 38 | puts "\n" |
39 | |||
diff --git a/test/network/veth-name.exp b/test/network/veth-name.exp index ccfb208ff..a9aeac9ae 100755 --- a/test/network/veth-name.exp +++ b/test/network/veth-name.exp | |||
@@ -7,7 +7,7 @@ set timeout 10 | |||
7 | spawn $env(SHELL) | 7 | spawn $env(SHELL) |
8 | match_max 100000 | 8 | match_max 100000 |
9 | 9 | ||
10 | # | 10 | # |
11 | send -- "firejail --net=br1 --ip=10.10.30.50 --veth-name=blablabla\r" | 11 | send -- "firejail --net=br1 --ip=10.10.30.50 --veth-name=blablabla\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 0\n";exit} | 13 | timeout {puts "TESTING ERROR 0\n";exit} |
@@ -74,4 +74,3 @@ sleep 1 | |||
74 | 74 | ||
75 | after 100 | 75 | after 100 |
76 | puts "\nall done\n" | 76 | puts "\nall done\n" |
77 | |||
diff --git a/test/option_readonly.exp b/test/option_readonly.exp index 4abbef617..d776ed823 100755 --- a/test/option_readonly.exp +++ b/test/option_readonly.exp | |||
@@ -23,4 +23,3 @@ expect { | |||
23 | sleep 1 | 23 | sleep 1 |
24 | 24 | ||
25 | puts "\n" | 25 | puts "\n" |
26 | |||
diff --git a/test/overlay/firefox-x11-xorg.exp b/test/overlay/firefox-x11-xorg.exp index 723431baa..efbe0e4d7 100755 --- a/test/overlay/firefox-x11-xorg.exp +++ b/test/overlay/firefox-x11-xorg.exp | |||
@@ -87,4 +87,3 @@ send -- "firejail --shutdown=test\r" | |||
87 | sleep 3 | 87 | sleep 3 |
88 | 88 | ||
89 | puts "\nall done\n" | 89 | puts "\nall done\n" |
90 | |||
diff --git a/test/overlay/firefox-x11.exp b/test/overlay/firefox-x11.exp index 982bd8149..f8b0740af 100755 --- a/test/overlay/firefox-x11.exp +++ b/test/overlay/firefox-x11.exp | |||
@@ -87,4 +87,3 @@ send -- "firejail --shutdown=test\r" | |||
87 | sleep 3 | 87 | sleep 3 |
88 | 88 | ||
89 | puts "\nall done\n" | 89 | puts "\nall done\n" |
90 | |||
diff --git a/test/overlay/firefox.exp b/test/overlay/firefox.exp index 5614198cd..1e719f86d 100755 --- a/test/overlay/firefox.exp +++ b/test/overlay/firefox.exp | |||
@@ -96,4 +96,3 @@ expect { | |||
96 | after 100 | 96 | after 100 |
97 | 97 | ||
98 | puts "\nall done\n" | 98 | puts "\nall done\n" |
99 | |||
diff --git a/test/overlay/fs-named.exp b/test/overlay/fs-named.exp index 2ccb22bb1..2519a8ede 100755 --- a/test/overlay/fs-named.exp +++ b/test/overlay/fs-named.exp | |||
@@ -63,4 +63,3 @@ expect { | |||
63 | after 100 | 63 | after 100 |
64 | 64 | ||
65 | puts "\nall done\n" | 65 | puts "\nall done\n" |
66 | |||
diff --git a/test/overlay/fs-tmpfs.exp b/test/overlay/fs-tmpfs.exp index 658d16779..7c1b5d1df 100755 --- a/test/overlay/fs-tmpfs.exp +++ b/test/overlay/fs-tmpfs.exp | |||
@@ -59,4 +59,3 @@ expect { | |||
59 | after 100 | 59 | after 100 |
60 | 60 | ||
61 | puts "\nall done\n" | 61 | puts "\nall done\n" |
62 | |||
diff --git a/test/overlay/fs.exp b/test/overlay/fs.exp index 15828f437..f8478e78b 100755 --- a/test/overlay/fs.exp +++ b/test/overlay/fs.exp | |||
@@ -51,4 +51,3 @@ expect { | |||
51 | after 100 | 51 | after 100 |
52 | 52 | ||
53 | puts "\nall done\n" | 53 | puts "\nall done\n" |
54 | |||
diff --git a/test/private_dir_profile.exp b/test/private_dir_profile.exp index 8d1c74444..7ba18aa69 100755 --- a/test/private_dir_profile.exp +++ b/test/private_dir_profile.exp | |||
@@ -51,4 +51,3 @@ expect { | |||
51 | } | 51 | } |
52 | 52 | ||
53 | puts "\nall done\n" | 53 | puts "\nall done\n" |
54 | |||
diff --git a/test/profiles/readonly.profile b/test/profiles/readonly.profile index 55d89e3d7..ca5a62327 100644 --- a/test/profiles/readonly.profile +++ b/test/profiles/readonly.profile | |||
@@ -1,2 +1,2 @@ | |||
1 | read-only /tmp/firejailtestdir | 1 | read-only /tmp/firejailtestdir |
2 | read-only /tmp/firejailtestfile \ No newline at end of file | 2 | read-only /tmp/firejailtestfile |
diff --git a/test/profiles/test2.profile b/test/profiles/test2.profile index d7e1a1f21..e219d800d 100644 --- a/test/profiles/test2.profile +++ b/test/profiles/test2.profile | |||
@@ -1,4 +1,4 @@ | |||
1 | caps | 1 | caps |
2 | seccomp | 2 | seccomp |
3 | private | 3 | private |
4 | include test.profile | 4 | include test.profile |
diff --git a/test/root/firemon-events.exp b/test/root/firemon-events.exp index 4f305e51d..8f6dd583b 100755 --- a/test/root/firemon-events.exp +++ b/test/root/firemon-events.exp | |||
@@ -69,4 +69,3 @@ expect { | |||
69 | 69 | ||
70 | 70 | ||
71 | puts "\nall done\n" | 71 | puts "\nall done\n" |
72 | |||
diff --git a/test/root/isc-dhcp.exp b/test/root/isc-dhcp.exp index 5d9597e7c..24243d6bb 100755 --- a/test/root/isc-dhcp.exp +++ b/test/root/isc-dhcp.exp | |||
@@ -46,4 +46,3 @@ sleep 2 | |||
46 | 46 | ||
47 | 47 | ||
48 | puts "\nall done\n" | 48 | puts "\nall done\n" |
49 | |||
diff --git a/test/root/option_bind_directory.exp b/test/root/option_bind_directory.exp index 3233c68de..2156c7dfa 100755 --- a/test/root/option_bind_directory.exp +++ b/test/root/option_bind_directory.exp | |||
@@ -19,4 +19,3 @@ expect { | |||
19 | sleep 1 | 19 | sleep 1 |
20 | 20 | ||
21 | puts "\n" | 21 | puts "\n" |
22 | |||
diff --git a/test/root/option_bind_file.exp b/test/root/option_bind_file.exp index 8926e0391..107d8bccb 100755 --- a/test/root/option_bind_file.exp +++ b/test/root/option_bind_file.exp | |||
@@ -19,4 +19,3 @@ expect { | |||
19 | sleep 1 | 19 | sleep 1 |
20 | 20 | ||
21 | puts "\n" | 21 | puts "\n" |
22 | |||
diff --git a/test/root/profile_tmpfs.exp b/test/root/profile_tmpfs.exp index 25f73b50b..bcb632c20 100755 --- a/test/root/profile_tmpfs.exp +++ b/test/root/profile_tmpfs.exp | |||
@@ -37,4 +37,3 @@ after 100 | |||
37 | 37 | ||
38 | 38 | ||
39 | puts "\nall done\n" | 39 | puts "\nall done\n" |
40 | |||
diff --git a/test/root/root.sh b/test/root/root.sh index 406e7dc4f..912ae23f0 100755 --- a/test/root/root.sh +++ b/test/root/root.sh | |||
@@ -121,4 +121,3 @@ fi | |||
121 | 121 | ||
122 | # restore the default config file | 122 | # restore the default config file |
123 | #cp ../../etc/firejail.config /etc/firejail/firejail.config | 123 | #cp ../../etc/firejail.config /etc/firejail/firejail.config |
124 | |||
diff --git a/test/root/whitelist.exp b/test/root/whitelist.exp index 06a9a5419..1ba711c63 100755 --- a/test/root/whitelist.exp +++ b/test/root/whitelist.exp | |||
@@ -115,4 +115,3 @@ send -- "exit\r" | |||
115 | 115 | ||
116 | after 100 | 116 | after 100 |
117 | puts "\nall done\n" | 117 | puts "\nall done\n" |
118 | |||
diff --git a/test/stress/blacklist.exp b/test/stress/blacklist.exp index 33e2c262e..abf6c985f 100755 --- a/test/stress/blacklist.exp +++ b/test/stress/blacklist.exp | |||
@@ -57,4 +57,3 @@ sleep 1 | |||
57 | 57 | ||
58 | after 100 | 58 | after 100 |
59 | puts "\nall done\n" | 59 | puts "\nall done\n" |
60 | |||
diff --git a/test/stress/net_macvlan.exp b/test/stress/net_macvlan.exp index e0e494ef8..33a95b885 100755 --- a/test/stress/net_macvlan.exp +++ b/test/stress/net_macvlan.exp | |||
@@ -49,4 +49,3 @@ expect { | |||
49 | 49 | ||
50 | after 100 | 50 | after 100 |
51 | puts "\nall done\n" | 51 | puts "\nall done\n" |
52 | |||
diff --git a/test/stress/stress.sh b/test/stress/stress.sh index 6a140ab22..57a8cae56 100755 --- a/test/stress/stress.sh +++ b/test/stress/stress.sh | |||
@@ -39,4 +39,3 @@ rm env.profile | |||
39 | # network arp testing | 39 | # network arp testing |
40 | echo "TESTING: macvlan (test/stress/net_macvlan.exp)" | 40 | echo "TESTING: macvlan (test/stress/net_macvlan.exp)" |
41 | ./net_macvlan.exp | 41 | ./net_macvlan.exp |
42 | |||
diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh index 02eb0f41d..859d782c6 100755 --- a/test/sysutils/sysutils.sh +++ b/test/sysutils/sysutils.sh | |||
@@ -77,4 +77,3 @@ then | |||
77 | else | 77 | else |
78 | echo "TESTING SKIP: tar not found" | 78 | echo "TESTING SKIP: tar not found" |
79 | fi | 79 | fi |
80 | |||
diff --git a/test/sysutils/xzdec.exp b/test/sysutils/xzdec.exp index e60c1af64..0f3b3ba08 100755 --- a/test/sysutils/xzdec.exp +++ b/test/sysutils/xzdec.exp | |||
@@ -20,7 +20,7 @@ send -- "diff -s firejail_t1 firejail_t2\r" | |||
20 | expect { | 20 | expect { |
21 | timeout {puts "TESTING ERROR 1\n";exit} | 21 | timeout {puts "TESTING ERROR 1\n";exit} |
22 | "firejail_t1 and firejail_t2 are identical" | 22 | "firejail_t1 and firejail_t2 are identical" |
23 | } | 23 | } |
24 | 24 | ||
25 | send -- "rm firejail_t*\r" | 25 | send -- "rm firejail_t*\r" |
26 | sleep 1 | 26 | sleep 1 |
diff --git a/test/test.sh b/test/test.sh index f0330e139..2693cb702 100755 --- a/test/test.sh +++ b/test/test.sh | |||
@@ -67,5 +67,3 @@ echo "TESTING: firemon --arp (firemon-arp.exp)" | |||
67 | 67 | ||
68 | echo "TESTING: firemon --route (firemon-route.exp)" | 68 | echo "TESTING: firemon --route (firemon-route.exp)" |
69 | ./firemon-route.exp | 69 | ./firemon-route.exp |
70 | |||
71 | |||
diff --git a/test/tty.exp b/test/tty.exp index 116f297b2..0d66f5ce7 100755 --- a/test/tty.exp +++ b/test/tty.exp | |||
@@ -94,4 +94,3 @@ send -- "exit\r" | |||
94 | sleep 2 | 94 | sleep 2 |
95 | 95 | ||
96 | puts "\n" | 96 | puts "\n" |
97 | |||
diff --git a/test/utils/caps1.profile b/test/utils/caps1.profile index e14655b2e..78c18fc64 100644 --- a/test/utils/caps1.profile +++ b/test/utils/caps1.profile | |||
@@ -1 +1 @@ | |||
caps.drop chown,kill \ No newline at end of file | caps.drop chown,kill | ||
diff --git a/test/utils/firemon-caps.exp b/test/utils/firemon-caps.exp index dd02611df..67bf853fe 100755 --- a/test/utils/firemon-caps.exp +++ b/test/utils/firemon-caps.exp | |||
@@ -127,4 +127,3 @@ expect { | |||
127 | after 100 | 127 | after 100 |
128 | 128 | ||
129 | puts "all done\n" | 129 | puts "all done\n" |
130 | |||
diff --git a/test/utils/firemon-cgroup.exp b/test/utils/firemon-cgroup.exp index 156edaa8f..43dfc4107 100755 --- a/test/utils/firemon-cgroup.exp +++ b/test/utils/firemon-cgroup.exp | |||
@@ -38,4 +38,3 @@ expect { | |||
38 | after 100 | 38 | after 100 |
39 | 39 | ||
40 | puts "\nall done\n" | 40 | puts "\nall done\n" |
41 | |||
diff --git a/test/utils/firemon-cpu.exp b/test/utils/firemon-cpu.exp index 7cb20105f..adc6b3d45 100755 --- a/test/utils/firemon-cpu.exp +++ b/test/utils/firemon-cpu.exp | |||
@@ -41,4 +41,3 @@ expect { | |||
41 | after 100 | 41 | after 100 |
42 | 42 | ||
43 | puts "\nall done\n" | 43 | puts "\nall done\n" |
44 | |||
diff --git a/test/utils/firemon-interface.exp b/test/utils/firemon-interface.exp index 8fbdf7740..4c976b42f 100755 --- a/test/utils/firemon-interface.exp +++ b/test/utils/firemon-interface.exp | |||
@@ -15,4 +15,3 @@ expect { | |||
15 | after 100 | 15 | after 100 |
16 | 16 | ||
17 | puts "\nall done\n" | 17 | puts "\nall done\n" |
18 | |||
diff --git a/test/utils/firemon-name.exp b/test/utils/firemon-name.exp index dc7cbee99..37bfdd3b0 100755 --- a/test/utils/firemon-name.exp +++ b/test/utils/firemon-name.exp | |||
@@ -25,4 +25,3 @@ expect { | |||
25 | after 100 | 25 | after 100 |
26 | 26 | ||
27 | puts "\nall done\n" | 27 | puts "\nall done\n" |
28 | |||
diff --git a/test/utils/firemon-version.exp b/test/utils/firemon-version.exp index c297bec43..94f72e454 100755 --- a/test/utils/firemon-version.exp +++ b/test/utils/firemon-version.exp | |||
@@ -15,4 +15,3 @@ expect { | |||
15 | after 100 | 15 | after 100 |
16 | 16 | ||
17 | puts "\nall done\n" | 17 | puts "\nall done\n" |
18 | |||
diff --git a/test/utils/help.exp b/test/utils/help.exp index 4c3aede9b..435f8e061 100755 --- a/test/utils/help.exp +++ b/test/utils/help.exp | |||
@@ -22,4 +22,3 @@ expect { | |||
22 | after 100 | 22 | after 100 |
23 | 23 | ||
24 | puts "\n" | 24 | puts "\n" |
25 | |||
diff --git a/test/utils/list.exp b/test/utils/list.exp index 321f2bc50..5b34b4866 100755 --- a/test/utils/list.exp +++ b/test/utils/list.exp | |||
@@ -48,4 +48,3 @@ after 100 | |||
48 | 48 | ||
49 | 49 | ||
50 | puts "\n" | 50 | puts "\n" |
51 | |||
diff --git a/test/utils/man.exp b/test/utils/man.exp index a28370c65..71dc703aa 100755 --- a/test/utils/man.exp +++ b/test/utils/man.exp | |||
@@ -17,4 +17,3 @@ after 100 | |||
17 | send -- "q\r" | 17 | send -- "q\r" |
18 | after 100 | 18 | after 100 |
19 | puts "\n" | 19 | puts "\n" |
20 | |||
diff --git a/test/utils/top.exp b/test/utils/top.exp index 7117cb883..73903d11f 100755 --- a/test/utils/top.exp +++ b/test/utils/top.exp | |||
@@ -37,4 +37,3 @@ expect { | |||
37 | after 100 | 37 | after 100 |
38 | 38 | ||
39 | puts "\nall done\n" | 39 | puts "\nall done\n" |
40 | |||
diff --git a/test/utils/tree.exp b/test/utils/tree.exp index 53f8cf795..a64c98bca 100755 --- a/test/utils/tree.exp +++ b/test/utils/tree.exp | |||
@@ -60,4 +60,3 @@ after 100 | |||
60 | 60 | ||
61 | 61 | ||
62 | puts "\n" | 62 | puts "\n" |
63 | |||
diff --git a/test/utils/utils.sh b/test/utils/utils.sh index 751f1f8e7..a59a9544f 100755 --- a/test/utils/utils.sh +++ b/test/utils/utils.sh | |||
@@ -111,4 +111,3 @@ echo "TESTING: firemon interface (test/utils/firemon-interface.exp)" | |||
111 | 111 | ||
112 | echo "TESTING: firemon name (test/utils/firemon-name.exp)" | 112 | echo "TESTING: firemon name (test/utils/firemon-name.exp)" |
113 | ./firemon-name.exp | 113 | ./firemon-name.exp |
114 | |||
diff --git a/test/utils/version.exp b/test/utils/version.exp index 261e40466..35dfc1c86 100755 --- a/test/utils/version.exp +++ b/test/utils/version.exp | |||
@@ -15,4 +15,3 @@ expect { | |||
15 | after 100 | 15 | after 100 |
16 | 16 | ||
17 | puts "\n" | 17 | puts "\n" |
18 | |||