testing

15 files changed, 113 insertions, 31 deletions

diff --git a/test/shell_csh.exp b/test/environment/csh.exp
index a2634f633..10ad3607e 100755
--- a/test/shell_csh.exp
+++ b/test/environment/csh.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/shell_dash.exp b/test/environment/dash.exp
index f5a60719e..f5a60719e 100755
--- a/test/shell_dash.exp
+++ b/test/environment/dash.exp
diff --git a/test/env.exp b/test/environment/env.exp
index d7aee3c64..a09c3f9c5 100755
--- a/test/env.exp
+++ b/test/environment/env.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/env.profile b/test/environment/env.profile
index ba66e6210..ba66e6210 100644
--- a/test/env.profile
+++ b/test/environment/env.profile
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
new file mode 100755
index 000000000..3041fcc12
--- /dev/null
+++ b/test/environment/environment.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
+
+export MALLOC_CHECK_=3
+export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
+
+echo "TESTING: environment variables (test/environment/env.exp)"
+./env.exp
+
+echo "TESTING: shell none(test/environment/shell-none.exp)"
+./shell-none.exp
+
+which dash
+if [ "$?" -eq 0 ];
+then
+        echo "TESTING: dash (test/environment/dash.exp)"
+        ./dash.exp
+else
+        echo "TESTING: dash not found"
+fi
+
+which csh
+if [ "$?" -eq 0 ];
+then
+        echo "TESTING: csh (test/environment/csh.exp)"
+        ./csh.exp
+else
+        echo "TESTING: csh not found"
+fi
+
+which zsh
+if [ "$?" -eq 0 ];
+then
+        echo "TESTING: zsh (test/environment/zsh.exp)"
+        ./csh.exp
+else
+        echo "TESTING: zsh not found"
+fi
+
+echo "TESTING: rlimit (test/environment/rlimit.exp)"
+./rlimit.exp
+
+echo "TESTING: rlimit profile (test/environment/rlimit-profile.exp)"
+./rlimit-profile.exp
+
diff --git a/test/firejail-in-firejail.exp b/test/environment/firejail-in-firejail.exp
index 5ba18d1fa..7e7f4fd17 100755
--- a/test/firejail-in-firejail.exp
+++ b/test/environment/firejail-in-firejail.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/firejail-in-firejail2.exp b/test/environment/firejail-in-firejail2.exp
index b0fed0dae..5a2213074 100755
--- a/test/firejail-in-firejail2.exp
+++ b/test/environment/firejail-in-firejail2.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/profile_rlimit.exp b/test/environment/rlimit-profile.exp
index 7d2637444..7d2637444 100755
--- a/test/profile_rlimit.exp
+++ b/test/environment/rlimit-profile.exp
diff --git a/test/option_rlimit.exp b/test/environment/rlimit.exp
index 17d2bd9d1..17d2bd9d1 100755
--- a/test/option_rlimit.exp
+++ b/test/environment/rlimit.exp
diff --git a/test/rlimit.profile b/test/environment/rlimit.profile
index 271891c03..271891c03 100644
--- a/test/rlimit.profile
+++ b/test/environment/rlimit.profile
diff --git a/test/environment/shell-none.exp b/test/environment/shell-none.exp
new file mode 100755
index 000000000..e30008f83
--- /dev/null
+++ b/test/environment/shell-none.exp
@@ -0,0 +1,48 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send -- "firejail  --shell=none\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "shell=none configured, but no program specified"
+}
+sleep 1
+
+send -- "firejail  --profile=shell-none.profile\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "shell=none configured, but no program specified"
+}
+sleep 1
+
+send -- "firejail  --shell=none ls\r"
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "Child process initialized"
+}
+expect {
+        timeout {puts "TESTING ERROR 3\n";exit}
+        "environment.sh"
+}
+sleep 1
+
+send -- "firejail  --profile=shell-none.profile ls\r"
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "Child process initialized"
+}
+expect {
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "environment.sh"
+}
+sleep 1
+
+
+puts "\nall done\n"
+
diff --git a/test/environment/shell-none.profile b/test/environment/shell-none.profile
new file mode 100644
index 000000000..f16ebe3a0
--- /dev/null
+++ b/test/environment/shell-none.profile
@@ -0,0 +1 @@
+shell none
diff --git a/test/shell_zsh.exp b/test/environment/zsh.exp
index 1d73fd926..2604b2be5 100755
--- a/test/shell_zsh.exp
+++ b/test/environment/zsh.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/test.sh b/test/test.sh
index ba5268036..e92a0f902 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -34,9 +34,6 @@ echo "TESTING: protocol (protocol.exp)"
 echo "TESTING: invalid filename (invalid_filename.exp)"
 ./invalid_filename.exp
 
-echo "TESTING: environment variables (env.exp)"
-./env.exp
-
 echo "TESTING: whitelist empty (whitelist-empty.exp)"
 ./whitelist-empty.exp
 
@@ -96,15 +93,6 @@ echo "TESTING: extract command (extract_command.exp)"
 echo "TESTING: kmsg access (kmsg.exp)"
 ./kmsg.exp
 
-echo "TESTING: rlimit (option_rlimit.exp)"
-./option_rlimit.exp
-
-echo "TESTING: firejail in firejail - single sandbox (firejail-in-firejail.exp)"
-./firejail-in-firejail.exp
-
-echo "TESTING: firejail in firejail - force new sandbox (firejail-in-firejail2.exp)"
-./firejail-in-firejail2.exp
-
 echo "TESTING: chroot overlay (option_chroot_overlay.exp)"
 ./option_chroot_overlay.exp
 
@@ -135,20 +123,6 @@ ls -al > tmpreadonly
 sleep 5
 rm -f tmpreadonly
 
-echo "TESTING: zsh (shell_zsh.exp)"
-./shell_zsh.exp
-
-echo "TESTING: csh (shell_csh.exp)"
-./shell_csh.exp
-
-which dash
-if [ "$?" -eq 0 ];
-then
-        echo "TESTING: dash (shell_dash.exp)"
-        ./shell_dash.exp
-else
-        echo "TESTING: dash not found"
-fi
 
 echo "TESTING: PID (pid.exp)"
 ./pid.exp
@@ -159,9 +133,6 @@ echo "TESTING: output (output.exp)"
 echo "TESTING: profile no permissions (profile_noperm.exp)"
 ./profile_noperm.exp
 
-echo "TESTING: profile rlimit (profile_rlimit.exp)"
-./profile_rlimit.exp
-
 echo "TESTING: profile read-only (profile_readonly.exp)"
 ./profile_readonly.exp
 
diff --git a/test/utils/utils.sh b/test/utils/utils.sh
index a40845a5f..9a1b6601a 100755
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -55,8 +55,8 @@ echo "TESTING: shutdown4 (test/utils/shutdown4.exp)"
 echo "TESTING: join test/utils/(join.exp)"
 ./join.exp
 
-echo "TESTING: join2 test/utils/(join2.exp)"
-.join2.exp
+echo "TESTING: join2 (test/utils/join2.exp)"
+./join2.exp
 
 echo "TESTING: join3 (test/utils/join3.exp)"
 ./join3.exp