diff options
Diffstat (limited to 'test')
-rwxr-xr-x | test/apps-x11/chromium.exp | 2 | ||||
-rwxr-xr-x | test/apps/chromium.exp | 2 | ||||
-rwxr-xr-x | test/arguments/joinrun.exp | 4 | ||||
-rwxr-xr-x | test/arguments/joinrun.sh | 10 | ||||
-rwxr-xr-x | test/arguments/outrun.sh | 6 | ||||
-rwxr-xr-x | test/arguments/symrun.sh | 17 | ||||
-rwxr-xr-x | test/filters/syscall_test | bin | 11095 -> 9552 bytes | |||
-rwxr-xr-x | test/filters/syscall_test32 | bin | 8907 -> 6868 bytes |
8 files changed, 19 insertions, 22 deletions
diff --git a/test/apps-x11/chromium.exp b/test/apps-x11/chromium.exp index 3ec2bc049..a7eace125 100755 --- a/test/apps-x11/chromium.exp +++ b/test/apps-x11/chromium.exp | |||
@@ -71,7 +71,7 @@ expect { | |||
71 | } | 71 | } |
72 | expect { | 72 | expect { |
73 | timeout {puts "TESTING ERROR 6.2\n";exit} | 73 | timeout {puts "TESTING ERROR 6.2\n";exit} |
74 | "fffffffff" | 74 | "00240000" |
75 | } | 75 | } |
76 | expect { | 76 | expect { |
77 | timeout {puts "TESTING ERROR 6.3\n";exit} | 77 | timeout {puts "TESTING ERROR 6.3\n";exit} |
diff --git a/test/apps/chromium.exp b/test/apps/chromium.exp index 041918d7f..6b784e395 100755 --- a/test/apps/chromium.exp +++ b/test/apps/chromium.exp | |||
@@ -72,7 +72,7 @@ expect { | |||
72 | } | 72 | } |
73 | expect { | 73 | expect { |
74 | timeout {puts "TESTING ERROR 6.2\n";exit} | 74 | timeout {puts "TESTING ERROR 6.2\n";exit} |
75 | "fffffffff" | 75 | "00240000" |
76 | } | 76 | } |
77 | expect { | 77 | expect { |
78 | timeout {puts "TESTING ERROR 6.3\n";exit} | 78 | timeout {puts "TESTING ERROR 6.3\n";exit} |
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 { | |||
35 | timeout {puts "TESTING ERROR 3.2.3\n";exit} | 35 | timeout {puts "TESTING ERROR 3.2.3\n";exit} |
36 | "#arg2 tail#" | 36 | "#arg2 tail#" |
37 | } | 37 | } |
38 | |||
39 | # todo: remove exit and fix it | ||
40 | exit | ||
41 | |||
42 | expect { | 38 | expect { |
43 | timeout {puts "TESTING ERROR 3.3.1\n";exit} | 39 | timeout {puts "TESTING ERROR 3.3.1\n";exit} |
44 | "Arguments:" | 40 | "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 | |||
5 | 5 | ||
6 | # simple quotes, testing spaces in file names | 6 | # simple quotes, testing spaces in file names |
7 | echo "TESTING: 3.2 - args with space and \"" | 7 | echo "TESTING: 3.2 - args with space and \"" |
8 | firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit "arg1 tail" "arg2 tail" | 8 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit "arg1 tail" "arg2 tail" |
9 | 9 | ||
10 | echo "TESTING: 3.3 - args with space and '" | 10 | echo "TESTING: 3.3 - args with space and '" |
11 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1 tail' 'arg2 tail' | 11 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit 'arg1 tail' 'arg2 tail' |
12 | 12 | ||
13 | # escaped space in file names | 13 | # escaped space in file names |
14 | echo "TESTING: 3.4 - args with space and \\" | 14 | echo "TESTING: 3.4 - args with space and \\" |
15 | firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit arg1\ tail arg2\ tail | 15 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit arg1\ tail arg2\ tail |
16 | 16 | ||
17 | # & char appears in URLs - URLs should be quoted | 17 | # & char appears in URLs - URLs should be quoted |
18 | echo "TESTING: 3.5 - args with & and \"" | 18 | echo "TESTING: 3.5 - args with & and \"" |
19 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit "arg1&tail" "arg2&tail" | 19 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit "arg1&tail" "arg2&tail" |
20 | 20 | ||
21 | echo "TESTING: 3.6 - args with & and '" | 21 | echo "TESTING: 3.6 - args with & and '" |
22 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1&tail' 'arg2&tail' | 22 | 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 \"" | |||
8 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1 tail" "arg2 tail" | 8 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1 tail" "arg2 tail" |
9 | 9 | ||
10 | echo "TESTING: 4.3 - args with space and '" | 10 | echo "TESTING: 4.3 - args with space and '" |
11 | firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit 'arg1 tail' 'arg2 tail' | 11 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit 'arg1 tail' 'arg2 tail' |
12 | 12 | ||
13 | # escaped space in file names | 13 | # escaped space in file names |
14 | echo "TESTING: 4.4 - args with space and \\" | 14 | echo "TESTING: 4.4 - args with space and \\" |
15 | firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit arg1\ tail arg2\ tail | 15 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit arg1\ tail arg2\ tail |
16 | 16 | ||
17 | # & char appears in URLs - URLs should be quoted | 17 | # & char appears in URLs - URLs should be quoted |
18 | echo "TESTING: 4.5 - args with & and \"" | 18 | echo "TESTING: 4.5 - args with & and \"" |
19 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1&tail" "arg2&tail" | 19 | firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1&tail" "arg2&tail" |
20 | 20 | ||
21 | echo "TESTING: 4.6 - args with & and '" | 21 | echo "TESTING: 4.6 - args with & and '" |
22 | firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit 'arg1&tail' 'arg2&tail' | 22 | 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 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | 2 | ||
3 | mkdir symtest | 3 | mkdir symtest |
4 | ln -s /usr/bin/firejail symtest/argtest | 4 | ln -s /usr/bin/firejail symtest/faudit |
5 | 5 | ||
6 | # search for argtest in current directory | 6 | # search for faudit in current directory |
7 | export PATH=$PATH:. | 7 | export PATH=$PATH:. |
8 | export FIREJAIL_TEST_ARGUMENTS=yes | ||
8 | 9 | ||
9 | echo "TESTING: 2.1 - simple args" | 10 | echo "TESTING: 2.1 - simple args" |
10 | symtest/argtest arg1 arg2 | 11 | symtest/faudit arg1 arg2 |
11 | 12 | ||
12 | # simple quotes, testing spaces in file names | 13 | # simple quotes, testing spaces in file names |
13 | echo "TESTING: 2.2 - args with space and \"" | 14 | echo "TESTING: 2.2 - args with space and \"" |
14 | symtest/argtest "arg1 tail" "arg2 tail" | 15 | symtest/faudit "arg1 tail" "arg2 tail" |
15 | 16 | ||
16 | echo "TESTING: 2.3 - args with space and '" | 17 | echo "TESTING: 2.3 - args with space and '" |
17 | symtest/argtest 'arg1 tail' 'arg2 tail' | 18 | symtest/faudit 'arg1 tail' 'arg2 tail' |
18 | 19 | ||
19 | # escaped space in file names | 20 | # escaped space in file names |
20 | echo "TESTING: 2.4 - args with space and \\" | 21 | echo "TESTING: 2.4 - args with space and \\" |
21 | symtest/argtest arg1\ tail arg2\ tail | 22 | symtest/faudit arg1\ tail arg2\ tail |
22 | 23 | ||
23 | # & char appears in URLs - URLs should be quoted | 24 | # & char appears in URLs - URLs should be quoted |
24 | echo "TESTING: 2.5 - args with & and \"" | 25 | echo "TESTING: 2.5 - args with & and \"" |
25 | symtest/argtest "arg1&tail" "arg2&tail" | 26 | symtest/faudit "arg1&tail" "arg2&tail" |
26 | 27 | ||
27 | echo "TESTING: 2.6 - args with & and '" | 28 | echo "TESTING: 2.6 - args with & and '" |
28 | symtest/argtest 'arg1&tail' 'arg2&tail' | 29 | symtest/faudit 'arg1&tail' 'arg2&tail' |
29 | 30 | ||
30 | rm -fr symtest | 31 | rm -fr symtest |
diff --git a/test/filters/syscall_test b/test/filters/syscall_test index 12edd2d64..bf29c5b99 100755 --- a/test/filters/syscall_test +++ b/test/filters/syscall_test | |||
Binary files differ | |||
diff --git a/test/filters/syscall_test32 b/test/filters/syscall_test32 index 29af1e073..8d72f58c4 100755 --- a/test/filters/syscall_test32 +++ b/test/filters/syscall_test32 | |||
Binary files differ | |||