fixed test-arguments

6 files changed, 38 insertions, 114 deletions

diff --git a/test/arguments/args.c b/test/arguments/args.c
new file mode 100644
index 000000000..941850767
--- /dev/null
+++ b/test/arguments/args.c
@@ -0,0 +1,12 @@
+#include <stdio.h>
+
+int main(int argc, char **argv) {
+        printf("Arguments:\n");
+
+        int i;
+        for (i = 0; i < argc; i++) {
+                printf("#%s#\n", argv[i]);
+        }
+        
+        return 0;
+}
diff --git a/test/arguments/arguments.sh b/test/arguments/arguments.sh
index c3505c188..cbef6459f 100755
--- a/test/arguments/arguments.sh
+++ b/test/arguments/arguments.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-if [ -f /etc/debian_version ]; then
-        libdir=$(dirname "$(dpkg -L firejail | grep faudit)")
-        export PATH="$PATH:$libdir"
-fi
-export PATH="$PATH:/usr/lib/firejail:/usr/lib64/firejail"
+export MALLOC_CHECK_=3
+export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
+
+rm -f ./args
+gcc -o args args.c
 
 echo "TESTING: 1. regular bash session"
 ./bashrun.exp
@@ -18,3 +18,5 @@ sleep 1
 echo "TESTING: 3. --join option"
 ./joinrun.exp
 sleep 1
+
+rm ./args
diff --git a/test/arguments/bashrun.sh b/test/arguments/bashrun.sh
index a4773fd6c..8128ae37d 100755
--- a/test/arguments/bashrun.sh
+++ b/test/arguments/bashrun.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
 echo "TESTING: 1.1 - simple args"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit arg1 arg2
+firejail --quiet ./args arg1 arg2
 
 # simple quotes, testing spaces in file names
 echo "TESTING: 1.2 - args with space and \""
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit "arg1 tail" "arg2 tail"
+firejail --quiet ./args "arg1 tail" "arg2 tail"
 
 echo "TESTING: 1.3 - args with space and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1 tail' 'arg2 tail'
+firejail --quiet ./args 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 1.4 - args with space and \\"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit arg1\ tail arg2\ tail
+firejail --quiet ./args arg1\ tail arg2\ tail
 
 # & char appears in URLs - URLs should be quoted
 echo "TESTING: 1.5 - args with & and \""
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit "arg1&tail" "arg2&tail"
+firejail --quiet ./args "arg1&tail" "arg2&tail"
 
 echo "TESTING: 1.6 - args with & and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1&tail' 'arg2&tail'
+firejail --quiet ./args 'arg1&tail' 'arg2&tail'
diff --git a/test/arguments/joinrun.sh b/test/arguments/joinrun.sh
index b00ea0e80..12bd543c0 100755
--- a/test/arguments/joinrun.sh
+++ b/test/arguments/joinrun.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
 echo "TESTING: 3.1 - simple args"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit arg1 arg2
+firejail --join=joinrun ./args arg1 arg2
 
 # simple quotes, testing spaces in file names
 echo "TESTING: 3.2 - args with space and \""
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit "arg1 tail" "arg2 tail"
+firejail --join=joinrun ./args "arg1 tail" "arg2 tail"
 
 echo "TESTING: 3.3 - args with space and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit 'arg1 tail' 'arg2 tail'
+firejail --join=joinrun ./args 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 3.4 - args with space and \\"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit arg1\ tail arg2\ tail
+firejail --join=joinrun ./args 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 --join=joinrun faudit "arg1&tail" "arg2&tail"
+firejail --join=joinrun ./args "arg1&tail" "arg2&tail"
 
 echo "TESTING: 3.6 - args with & and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit 'arg1&tail' 'arg2&tail'
+firejail --join=joinrun ./args 'arg1&tail' 'arg2&tail'
diff --git a/test/arguments/outrun.exp b/test/arguments/outrun.exp
deleted file mode 100755
index d28e75661..000000000
--- a/test/arguments/outrun.exp
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/expect -f
-
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-
-send --  "./outrun.sh\r"
-expect {
-        timeout {puts "TESTING ERROR 4.1.1\n";exit}
-        "Arguments:"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.1.2\n";exit}
-        "#arg1#"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.1.3\n";exit}
-        "#arg2#"
-}
-
-exit
-#***************************************************
-#  breaking down from here on - bug to fix
-#***************************************************
-expect {
-        timeout {puts "TESTING ERROR 4.2.1\n";exit}
-        "Arguments:"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.2.2\n";exit}
-        "#arg1 tail#"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.2.3\n";exit}
-        "#arg2 tail#"
-}
-
-expect {
-        timeout {puts "TESTING ERROR 4.3.1\n";exit}
-        "Arguments:"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.3.2\n";exit}
-        "#arg1 tail#"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.3.3\n";exit}
-        "#arg2 tail#"
-}
-
-expect {
-        timeout {puts "TESTING ERROR 4.4.1\n";exit}
-        "Arguments:"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.4.2\n";exit}
-        "#arg1 tail#"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.4.3\n";exit}
-        "#arg2 tail#"
-}
-
-expect {
-        timeout {puts "TESTING ERROR 4.5.1\n";exit}
-        "Arguments:"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.5.2\n";exit}
-        "#arg1&tail#"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.5.3\n";exit}
-        "#arg2&tail#"
-}
-
-expect {
-        timeout {puts "TESTING ERROR 4.6.1\n";exit}
-        "Arguments:"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.6.2\n";exit}
-        "#arg1&tail#"
-}
-expect {
-        timeout {puts "TESTING ERROR 4.6.3\n";exit}
-        "#arg2&tail#"
-}
-
-puts "\nall done\n"
diff --git a/test/arguments/symrun.sh b/test/arguments/symrun.sh
index db5f06835..b3932bf24 100755
--- a/test/arguments/symrun.sh
+++ b/test/arguments/symrun.sh
@@ -1,31 +1,31 @@
 #!/bin/bash
 
 mkdir symtest
-ln -s /usr/bin/firejail symtest/faudit
+ln -s /usr/bin/firejail symtest/firejail
 
 # search for faudit in current directory
 export PATH=$PATH:.
 export FIREJAIL_TEST_ARGUMENTS=yes
 
 echo "TESTING: 2.1 - simple args"
-symtest/faudit arg1 arg2
+symtest/firejail ./args arg1 arg2
 
 # simple quotes, testing spaces in file names
 echo "TESTING: 2.2 - args with space and \""
-symtest/faudit "arg1 tail" "arg2 tail"
+symtest/firejail ./args "arg1 tail" "arg2 tail"
 
 echo "TESTING: 2.3 - args with space and '"
-symtest/faudit 'arg1 tail' 'arg2 tail'
+symtest/firejail ./args 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 2.4 - args with space and \\"
-symtest/faudit arg1\ tail arg2\ tail
+symtest/firejail ./args arg1\ tail arg2\ tail
 
 # & char appears in URLs - URLs should be quoted
 echo "TESTING: 2.5 - args with & and \""
-symtest/faudit "arg1&tail" "arg2&tail"
+symtest/firejail ./args "arg1&tail" "arg2&tail"
 
 echo "TESTING: 2.6 - args with & and '"
-symtest/faudit 'arg1&tail' 'arg2&tail'
+symtest/firejail ./args 'arg1&tail' 'arg2&tail'
 
 rm -fr symtest