4 files changed, 17 insertions, 20 deletions

diff --git a/test/arguments/joinrun.exp b/test/arguments/joinrun.exp
index 097becacc..97972e5e8 100755
--- a/test/arguments/joinrun.exp
+++ b/test/arguments/joinrun.exp
@@ -35,10 +35,6 @@ expect {
         timeout {puts "TESTING ERROR 3.2.3\n";exit}
         "#arg2 tail#"
 }
-
-# todo: remove exit and fix it
-exit
-
 expect {
         timeout {puts "TESTING ERROR 3.3.1\n";exit}
         "Arguments:"
diff --git a/test/arguments/joinrun.sh b/test/arguments/joinrun.sh
index 3ed166839..b00ea0e80 100755
--- a/test/arguments/joinrun.sh
+++ b/test/arguments/joinrun.sh
@@ -5,18 +5,18 @@ firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit arg1 arg2
 
 # simple quotes, testing spaces in file names
 echo "TESTING: 3.2 - args with space and \""
-firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --quiet faudit "arg1 tail" "arg2 tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit "arg1 tail" "arg2 tail"
 
 echo "TESTING: 3.3 - args with space and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1 tail' 'arg2 tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 3.4 - args with space and \\"
-firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --quiet faudit arg1\ tail arg2\ tail
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit arg1\ tail arg2\ tail
 
 # & char appears in URLs - URLs should be quoted
 echo "TESTING: 3.5 - args with & and \""
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit "arg1&tail" "arg2&tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit "arg1&tail" "arg2&tail"
 
 echo "TESTING: 3.6 - args with & and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1&tail' 'arg2&tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit 'arg1&tail' 'arg2&tail'
diff --git a/test/arguments/outrun.sh b/test/arguments/outrun.sh
index e2b3046d6..5bc3b1e37 100755
--- a/test/arguments/outrun.sh
+++ b/test/arguments/outrun.sh
@@ -8,15 +8,15 @@ echo "TESTING: 4.2 - args with space and \""
 firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1 tail" "arg2 tail"
 
 echo "TESTING: 4.3 - args with space and '"
-firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --output=out faudit 'arg1 tail' 'arg2 tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 4.4 - args with space and \\"
-firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --output=out faudit arg1\ tail arg2\ tail
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit arg1\ tail arg2\ tail
 
 # & char appears in URLs - URLs should be quoted
 echo "TESTING: 4.5 - args with & and \""
 firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1&tail" "arg2&tail"
 
 echo "TESTING: 4.6 - args with & and '"
-firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --output=out faudit 'arg1&tail' 'arg2&tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit 'arg1&tail' 'arg2&tail'
diff --git a/test/arguments/symrun.sh b/test/arguments/symrun.sh
index d28f024a8..db5f06835 100755
--- a/test/arguments/symrun.sh
+++ b/test/arguments/symrun.sh
@@ -1,30 +1,31 @@
 #!/bin/bash
 
 mkdir symtest
-ln -s /usr/bin/firejail symtest/argtest
+ln -s /usr/bin/firejail symtest/faudit
 
-# search for argtest in current directory
+# search for faudit in current directory
 export PATH=$PATH:.
+export FIREJAIL_TEST_ARGUMENTS=yes
 
 echo "TESTING: 2.1 - simple args"
-symtest/argtest arg1 arg2
+symtest/faudit arg1 arg2
 
 # simple quotes, testing spaces in file names
 echo "TESTING: 2.2 - args with space and \""
-symtest/argtest "arg1 tail" "arg2 tail"
+symtest/faudit "arg1 tail" "arg2 tail"
 
 echo "TESTING: 2.3 - args with space and '"
-symtest/argtest 'arg1 tail' 'arg2 tail'
+symtest/faudit 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 2.4 - args with space and \\"
-symtest/argtest arg1\ tail arg2\ tail
+symtest/faudit arg1\ tail arg2\ tail
 
 # & char appears in URLs - URLs should be quoted
 echo "TESTING: 2.5 - args with & and \""
-symtest/argtest "arg1&tail" "arg2&tail"
+symtest/faudit "arg1&tail" "arg2&tail"
 
 echo "TESTING: 2.6 - args with & and '"
-symtest/argtest 'arg1&tail' 'arg2&tail'
+symtest/faudit 'arg1&tail' 'arg2&tail'
 
 rm -fr symtest