diff options
author | netblue30 <netblue30@yahoo.com> | 2017-05-13 09:16:00 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2017-05-13 09:16:00 -0400 |
commit | 7345c5d3e2706b5eab61ba3d154b99b57f6b9a5f (patch) | |
tree | aed643c38277fe4bd5dc679f2b27f3930f725e69 | |
parent | 0.9.46 testing (diff) | |
download | firejail-7345c5d3e2706b5eab61ba3d154b99b57f6b9a5f.tar.gz firejail-7345c5d3e2706b5eab61ba3d154b99b57f6b9a5f.tar.zst firejail-7345c5d3e2706b5eab61ba3d154b99b57f6b9a5f.zip |
0.9.46 testing
-rw-r--r-- | src/firejail/no_sandbox.c | 3 | ||||
-rwxr-xr-x | test/arguments/arguments.sh | 1 | ||||
-rwxr-xr-x | test/environment/allow-debuggers.exp | 3 | ||||
-rwxr-xr-x | test/filters/filters.sh | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/firejail/no_sandbox.c b/src/firejail/no_sandbox.c index 9221aaa99..05f5abe2a 100644 --- a/src/firejail/no_sandbox.c +++ b/src/firejail/no_sandbox.c | |||
@@ -230,8 +230,5 @@ void run_no_sandbox(int argc, char **argv) { | |||
230 | 230 | ||
231 | arg_quiet = 1; | 231 | arg_quiet = 1; |
232 | 232 | ||
233 | // we don't want to run a shell, otherwise it will be recursively | ||
234 | arg_shell_none = 1; | ||
235 | |||
236 | start_application(); | 233 | start_application(); |
237 | } | 234 | } |
diff --git a/test/arguments/arguments.sh b/test/arguments/arguments.sh index d9b7058bf..73e589876 100755 --- a/test/arguments/arguments.sh +++ b/test/arguments/arguments.sh | |||
@@ -6,6 +6,7 @@ if [ -f /etc/debian_version ]; then | |||
6 | else | 6 | else |
7 | export PATH="$PATH:/usr/lib/firejail" | 7 | export PATH="$PATH:/usr/lib/firejail" |
8 | fi | 8 | fi |
9 | export PATH="$PATH:/usr/lib/firejail" | ||
9 | 10 | ||
10 | echo "TESTING: 1. regular bash session" | 11 | echo "TESTING: 1. regular bash session" |
11 | ./bashrun.exp | 12 | ./bashrun.exp |
diff --git a/test/environment/allow-debuggers.exp b/test/environment/allow-debuggers.exp index 8a404decb..f032e1c3e 100755 --- a/test/environment/allow-debuggers.exp +++ b/test/environment/allow-debuggers.exp | |||
@@ -8,7 +8,8 @@ match_max 100000 | |||
8 | send -- "firejail --profile=/etc/firejail/firefox.profile --allow-debuggers strace ls\r" | 8 | send -- "firejail --profile=/etc/firejail/firefox.profile --allow-debuggers strace ls\r" |
9 | expect { | 9 | expect { |
10 | timeout {puts "TESTING ERROR 0\n";exit} | 10 | timeout {puts "TESTING ERROR 0\n";exit} |
11 | "Child process initialized" | 11 | "Child process initialized" { puts "\n"} |
12 | "is disabled on Linux kernels prior to 4.8" { puts "TESTING SKIP: kernel too old\n"; exit } | ||
12 | } | 13 | } |
13 | expect { | 14 | expect { |
14 | timeout {puts "TESTING ERROR 1\n";exit} | 15 | timeout {puts "TESTING ERROR 1\n";exit} |
diff --git a/test/filters/filters.sh b/test/filters/filters.sh index 59d7d7e7f..6a5ec2b87 100755 --- a/test/filters/filters.sh +++ b/test/filters/filters.sh | |||
@@ -13,6 +13,8 @@ else | |||
13 | export PATH="$PATH:/usr/lib/firejail" | 13 | export PATH="$PATH:/usr/lib/firejail" |
14 | fi | 14 | fi |
15 | 15 | ||
16 | export PATH="$PATH:/usr/lib/firejail" | ||
17 | |||
16 | echo "TESTING: debug options (test/filters/debug.exp)" | 18 | echo "TESTING: debug options (test/filters/debug.exp)" |
17 | ./debug.exp | 19 | ./debug.exp |
18 | 20 | ||