testing

Makefile.in

@@ -215,13 +215,16 @@ test-environment:
 test-filters:
  cd test/filters; ./filters.sh | grep TESTING
 
+test-arguments:
+ cd test/arguments; ./arguments.sh | grep TESTING
+
 test-network:
  echo "Please read test/network/README file and run the test manually"
 
 test-fs:
  cd test/fs; ./fs.sh | grep TESTING
 
-test: test-profiles test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters
+test: test-profiles test-fs test-utils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments
  echo "TEST COMPLETE"
 
 gcov:;

src/faudit/main.c

@@ -21,6 +21,19 @@
 char *prog;
 
 int main(int argc, char **argv) {
+ // make test-arguments helper
+ if (getenv("FIREJAIL_TEST_ARGUMENTS")) {
+ printf("Arguments:\n");
+
+ int i;
+ for (i = 0; i < argc; i++) {
+ printf("#%s#\n", argv[i]);
+ }
+
+ return 0;
+ }
+
+
  if (argc != 1) {
  int i;
 

test/arguments/arguments.sh

@@ -4,12 +4,16 @@
 
 echo "TESTING: 1. regular bash session"
 ./bashrun.exp
+sleep 1
 
 echo "TESTING: 2. symbolic link to firejail"
 ./symrun.exp
+rm -fr symtest
+sleep 1
 
 echo "TESTING: 3. --join option"
 ./joinrun.exp
+sleep 1
 
 echo "TESTING: 4. --output option"
 ./outrun.exp

test/arguments/bashrun.sh

@@ -1,22 +1,22 @@
 #!/bin/bash
 
 echo "TESTING: 1.1 - simple args"
-firejail --quiet ./argtest arg1 arg2
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit arg1 arg2
 
 # simple quotes, testing spaces in file names
 echo "TESTING: 1.2 - args with space and \""
-firejail --quiet ./argtest "arg1 tail" "arg2 tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit "arg1 tail" "arg2 tail"
 
 echo "TESTING: 1.3 - args with space and '"
-firejail --quiet ./argtest 'arg1 tail' 'arg2 tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 1.4 - args with space and \\"
-firejail --quiet ./argtest arg1\ tail arg2\ tail
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit arg1\ tail arg2\ tail
 
 # & char appears in URLs - URLs should be quoted
 echo "TESTING: 1.5 - args with & and \""
-firejail --quiet ./argtest "arg1&tail" "arg2&tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit "arg1&tail" "arg2&tail"
 
 echo "TESTING: 1.6 - args with & and '"
-firejail --quiet ./argtest 'arg1&tail' 'arg2&tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit 'arg1&tail' 'arg2&tail'

test/arguments/joinrun.sh

@@ -1,22 +1,22 @@
 #!/bin/bash
 
 echo "TESTING: 3.1 - simple args"
-firejail --join=joinrun ./argtest arg1 arg2
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun /usr/lib/firejail/faudit arg1 arg2
 
 # simple quotes, testing spaces in file names
 echo "TESTING: 3.2 - args with space and \""
-firejail --quiet ./argtest "arg1 tail" "arg2 tail"
+firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit "arg1 tail" "arg2 tail"
 
 echo "TESTING: 3.3 - args with space and '"
-firejail --quiet ./argtest 'arg1 tail' 'arg2 tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 3.4 - args with space and \\"
-firejail --quiet ./argtest arg1\ tail arg2\ tail
+firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit arg1\ tail arg2\ tail
 
 # & char appears in URLs - URLs should be quoted
 echo "TESTING: 3.5 - args with & and \""
-firejail --quiet ./argtest "arg1&tail" "arg2&tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit "arg1&tail" "arg2&tail"
 
 echo "TESTING: 3.6 - args with & and '"
-firejail --quiet ./argtest 'arg1&tail' 'arg2&tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit 'arg1&tail' 'arg2&tail'

test/arguments/outrun.sh

@@ -1,22 +1,22 @@
 #!/bin/bash
 
 echo "TESTING: 4.1 - simple args"
-firejail --output=out ./argtest arg1 arg2
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out /usr/lib/firejail/faudit arg1 arg2
 
 # simple quotes, testing spaces in file names
 echo "TESTING: 4.2 - args with space and \""
-firejail --output=out ./argtest "arg1 tail" "arg2 tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out /usr/lib/firejail/faudit "arg1 tail" "arg2 tail"
 
 echo "TESTING: 4.3 - args with space and '"
-firejail --output=out ./argtest 'arg1 tail' 'arg2 tail'
+firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --output=out /usr/lib/firejail/faudit 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 4.4 - args with space and \\"
-firejail --output=out ./argtest arg1\ tail arg2\ tail
+firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --output=out /usr/lib/firejail/faudit arg1\ tail arg2\ tail
 
 # & char appears in URLs - URLs should be quoted
 echo "TESTING: 4.5 - args with & and \""
-firejail --output=out ./argtest "arg1&tail" "arg2&tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out /usr/lib/firejail/faudit "arg1&tail" "arg2&tail"
 
 echo "TESTING: 4.6 - args with & and '"
-firejail --output=out ./argtest 'arg1&tail' 'arg2&tail'
+firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --output=out /usr/lib/firejail/faudit 'arg1&tail' 'arg2&tail'