Merge pull request #657 from reinerh/master

Some test fixes

5 files changed, 11 insertions, 6 deletions

diff --git a/test/arguments/arguments.sh b/test/arguments/arguments.sh
index a9b3f9587..2f53eb3fa 100755
--- a/test/arguments/arguments.sh
+++ b/test/arguments/arguments.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+[ -f argtest ] || make argtest
+
 echo "TESTING: 1. regular bash session"
 ./bashrun.exp
 
diff --git a/test/arguments/symrun.exp b/test/arguments/symrun.exp
index 1466b791e..10e7ac6c8 100755
--- a/test/arguments/symrun.exp
+++ b/test/arguments/symrun.exp
@@ -4,7 +4,7 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
-send --  "./bashrun.sh\r"
+send --  "./symrun.sh\r"
 expect {
         timeout {puts "TESTING ERROR 2.1.1\n";exit}
         "Arguments:"
diff --git a/test/arguments/symrun.sh b/test/arguments/symrun.sh
index b46803ae2..d28f024a8 100755
--- a/test/arguments/symrun.sh
+++ b/test/arguments/symrun.sh
@@ -3,6 +3,9 @@
 mkdir symtest
 ln -s /usr/bin/firejail symtest/argtest
 
+# search for argtest in current directory
+export PATH=$PATH:.
+
 echo "TESTING: 2.1 - simple args"
 symtest/argtest arg1 arg2
 
diff --git a/test/environment/doubledash.exp b/test/environment/doubledash.exp
index 668468980..7abf4b918 100755
--- a/test/environment/doubledash.exp
+++ b/test/environment/doubledash.exp
@@ -36,23 +36,23 @@ expect {
 sleep 3
 
 spawn $env(SHELL)
-send --  "firejail --list;pwd\r"
+send --  "firejail --list;ls -d /tmp\r"
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
         "name=testing"
 }
 expect {
         timeout {puts "TESTING ERROR 7\n";exit}
-        "home"
+        "/tmp"
 }
-send --  "firejail --list;pwd\r"
+send --  "firejail --list;ls -d /tmp\r"
 expect {
         timeout {puts "TESTING ERROR 8 (join)\n";exit}
         "join=testing"
 }
 expect {
         timeout {puts "TESTING ERROR 9\n";exit}
-        "home"
+        "/tmp"
 }
 
 sleep 1
diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp
index bccb0b9f3..2913c6b14 100755
--- a/test/network/bandwidth.exp
+++ b/test/network/bandwidth.exp
@@ -18,7 +18,7 @@ spawn $env(SHELL)
 send -- "firejail --bandwidth=test status\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "qdisc pfifo_fast 0: dev eth0"
+        "qdisc * 0: dev eth0"
 }
 sleep 1