aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/firejail/no_sandbox.c3
-rwxr-xr-xtest/arguments/arguments.sh1
-rwxr-xr-xtest/environment/allow-debuggers.exp3
-rwxr-xr-xtest/filters/filters.sh2
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
6else 6else
7 export PATH="$PATH:/usr/lib/firejail" 7 export PATH="$PATH:/usr/lib/firejail"
8fi 8fi
9export PATH="$PATH:/usr/lib/firejail"
9 10
10echo "TESTING: 1. regular bash session" 11echo "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
8send -- "firejail --profile=/etc/firejail/firefox.profile --allow-debuggers strace ls\r" 8send -- "firejail --profile=/etc/firejail/firefox.profile --allow-debuggers strace ls\r"
9expect { 9expect {
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}
13expect { 14expect {
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"
14fi 14fi
15 15
16export PATH="$PATH:/usr/lib/firejail"
17
16echo "TESTING: debug options (test/filters/debug.exp)" 18echo "TESTING: debug options (test/filters/debug.exp)"
17./debug.exp 19./debug.exp
18 20