4 files changed, 97 insertions, 0 deletions

diff --git a/test/environment/nice.exp b/test/environment/nice.exp
index 2c00d1485..50e789c9e 100755
--- a/test/environment/nice.exp
+++ b/test/environment/nice.exp
@@ -77,7 +77,48 @@ expect {
         "top"
 }
 
+sleep 1
+send -- "exit\r"
+after 100
+
+
+# negative nice value should result in nice=0
+send -- "firejail --nice=-5\r"
+expect {
+        timeout {puts "TESTING ERROR 17\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+send -- "top -b -n 1\r"
+expect {
+        timeout {puts "TESTING ERROR 18\n";exit}
+        $env(USER)
+}
+expect {
+        timeout {puts "TESTING ERROR 19\n";exit}
+        "0"
+}
+expect {
+        timeout {puts "TESTING ERROR 20\n";exit}
+        "bash"
+}
+expect {
+        timeout {puts "TESTING ERROR 21\n";exit}
+        $env(USER)
+}
+expect {
+        timeout {puts "TESTING ERROR 22\n";exit}
+        "0"
+}
+expect {
+        timeout {puts "TESTING ERROR 23\n";exit}
+        "top"
+}
 
+sleep 1
+send -- "exit\r"
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/filters/debug.exp b/test/filters/debug.exp
new file mode 100755
index 000000000..493022c05
--- /dev/null
+++ b/test/filters/debug.exp
@@ -0,0 +1,45 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2017 Firejail Authors
+# License GPL v2
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send --  "firejail --debug-syscalls\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "set_mempolicy"
+}
+after 100
+
+send --  "firejail --debug-syscalls\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "setitimer"
+}
+after 100
+
+send --  "firejail --debug-errnos\r"
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "EBADMSG"
+}
+after 100
+
+send --  "firejail --debug-errnos\r"
+expect {
+        timeout {puts "TESTING ERROR 3\n";exit}
+        "ELIBMAX"
+}
+after 100
+
+send --  "firejail --debug-protocols\r"
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "unix, inet, inet6, netlink, packet"
+}
+after 100
+
+puts "all done\n"
diff --git a/test/filters/filters.sh b/test/filters/filters.sh
index 73e0e4d5c..4996e6d66 100755
--- a/test/filters/filters.sh
+++ b/test/filters/filters.sh
@@ -6,6 +6,9 @@
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 
+echo "TESTING: debug options (test/filters/debug.exp)"
+./debug.exp
+
 echo "TESTING: noroot (test/filters/noroot.exp)"
 ./noroot.exp
 
diff --git a/test/utils/join.exp b/test/utils/join.exp
index b74b0b17a..d5c421676 100755
--- a/test/utils/join.exp
+++ b/test/utils/join.exp
@@ -16,6 +16,14 @@ expect {
 sleep 2
 
 spawn $env(SHELL)
+send --  "firejail --shell=none --join=jointesting\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "shell=none set, but no command specified"
+}
+after 100
+
+
 send --  "firejail --join=jointesting\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}