diff options
author | netblue30 <netblue30@yahoo.com> | 2018-04-26 10:36:27 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2018-04-26 10:36:27 -0400 |
commit | 14faf11d2da1bf31fb92fcec91b8a511e4a3f1a6 (patch) | |
tree | 874cbd6c97b02b94eeae89485b420133785d5310 /test | |
parent | still tweaking baloo (diff) | |
download | firejail-14faf11d2da1bf31fb92fcec91b8a511e4a3f1a6.tar.gz firejail-14faf11d2da1bf31fb92fcec91b8a511e4a3f1a6.tar.zst firejail-14faf11d2da1bf31fb92fcec91b8a511e4a3f1a6.zip |
centos testing
Diffstat (limited to 'test')
-rwxr-xr-x | test/apps-x11-xorg/apps-x11-xorg.sh | 6 | ||||
-rwxr-xr-x | test/apps-x11/apps-x11.sh | 18 | ||||
-rwxr-xr-x | test/apps/apps.sh | 2 | ||||
-rwxr-xr-x | test/arguments/arguments.sh | 3 | ||||
-rwxr-xr-x | test/environment/environment.sh | 10 | ||||
-rwxr-xr-x | test/fcopy/fcopy.sh | 2 | ||||
-rwxr-xr-x | test/filters/filters.sh | 6 | ||||
-rwxr-xr-x | test/fnetfilter/fnetfilter.sh | 2 | ||||
-rwxr-xr-x | test/overlay/overlay.sh | 10 | ||||
-rwxr-xr-x | test/private-lib/private-lib.sh | 2 | ||||
-rwxr-xr-x | test/root/root.sh | 2 | ||||
-rwxr-xr-x | test/sysutils/sysutils.sh | 16 | ||||
-rwxr-xr-x | test/utils/utils.sh | 4 |
13 files changed, 40 insertions, 43 deletions
diff --git a/test/apps-x11-xorg/apps-x11-xorg.sh b/test/apps-x11-xorg/apps-x11-xorg.sh index 32331f786..ea07d3713 100755 --- a/test/apps-x11-xorg/apps-x11-xorg.sh +++ b/test/apps-x11-xorg/apps-x11-xorg.sh | |||
@@ -6,7 +6,7 @@ | |||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
7 | export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) | 7 | export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) |
8 | 8 | ||
9 | which firefox | 9 | which firefox 2>/dev/null |
10 | if [ "$?" -eq 0 ]; | 10 | if [ "$?" -eq 0 ]; |
11 | then | 11 | then |
12 | echo "TESTING: firefox x11 xorg" | 12 | echo "TESTING: firefox x11 xorg" |
@@ -15,7 +15,7 @@ else | |||
15 | echo "TESTING SKIP: firefox not found" | 15 | echo "TESTING SKIP: firefox not found" |
16 | fi | 16 | fi |
17 | 17 | ||
18 | which transmission-gtk | 18 | which transmission-gtk 2>/dev/null |
19 | if [ "$?" -eq 0 ]; | 19 | if [ "$?" -eq 0 ]; |
20 | then | 20 | then |
21 | echo "TESTING: transmission-gtk x11 xorg" | 21 | echo "TESTING: transmission-gtk x11 xorg" |
@@ -24,7 +24,7 @@ else | |||
24 | echo "TESTING SKIP: transmission-gtk not found" | 24 | echo "TESTING SKIP: transmission-gtk not found" |
25 | fi | 25 | fi |
26 | 26 | ||
27 | which thunderbird | 27 | which thunderbird 2>/dev/null |
28 | if [ "$?" -eq 0 ]; | 28 | if [ "$?" -eq 0 ]; |
29 | then | 29 | then |
30 | echo "TESTING: thunderbird x11 xorg" | 30 | echo "TESTING: thunderbird x11 xorg" |
diff --git a/test/apps-x11/apps-x11.sh b/test/apps-x11/apps-x11.sh index 2e0031dd9..c12b11f3e 100755 --- a/test/apps-x11/apps-x11.sh +++ b/test/apps-x11/apps-x11.sh | |||
@@ -10,20 +10,20 @@ echo "TESTING: no x11 (test/apps-x11/x11-none.exp)" | |||
10 | ./x11-none.exp | 10 | ./x11-none.exp |
11 | 11 | ||
12 | 12 | ||
13 | which xterm | 13 | which xterm 2>/dev/null |
14 | if [ "$?" -eq 0 ]; | 14 | if [ "$?" -eq 0 ]; |
15 | then | 15 | then |
16 | echo "TESTING: xterm x11 xorg" | 16 | echo "TESTING: xterm x11 xorg" |
17 | ./xterm-xorg.exp | 17 | ./xterm-xorg.exp |
18 | 18 | ||
19 | which xpra | 19 | which xpra 2>/dev/null |
20 | if [ "$?" -eq 0 ]; | 20 | if [ "$?" -eq 0 ]; |
21 | then | 21 | then |
22 | echo "TESTING: xterm x11 xpra" | 22 | echo "TESTING: xterm x11 xpra" |
23 | ./xterm-xpra.exp | 23 | ./xterm-xpra.exp |
24 | fi | 24 | fi |
25 | 25 | ||
26 | which Xephyr | 26 | which Xephyr 2>/dev/null |
27 | if [ "$?" -eq 0 ]; | 27 | if [ "$?" -eq 0 ]; |
28 | then | 28 | then |
29 | echo "TESTING: xterm x11 xephyr" | 29 | echo "TESTING: xterm x11 xephyr" |
@@ -34,13 +34,13 @@ else | |||
34 | fi | 34 | fi |
35 | 35 | ||
36 | # check xpra/xephyr | 36 | # check xpra/xephyr |
37 | which xpra | 37 | which xpra 2>/dev/null |
38 | if [ "$?" -eq 0 ]; | 38 | if [ "$?" -eq 0 ]; |
39 | then | 39 | then |
40 | echo "xpra found" | 40 | echo "xpra found" |
41 | else | 41 | else |
42 | echo "xpra not found" | 42 | echo "xpra not found" |
43 | which Xephyr | 43 | which Xephyr 2>/dev/null |
44 | if [ "$?" -eq 0 ]; | 44 | if [ "$?" -eq 0 ]; |
45 | then | 45 | then |
46 | echo "Xephyr found" | 46 | echo "Xephyr found" |
@@ -50,7 +50,7 @@ else | |||
50 | fi | 50 | fi |
51 | fi | 51 | fi |
52 | 52 | ||
53 | which firefox | 53 | which firefox 2>/dev/null |
54 | if [ "$?" -eq 0 ]; | 54 | if [ "$?" -eq 0 ]; |
55 | then | 55 | then |
56 | echo "TESTING: firefox x11" | 56 | echo "TESTING: firefox x11" |
@@ -59,7 +59,7 @@ else | |||
59 | echo "TESTING SKIP: firefox not found" | 59 | echo "TESTING SKIP: firefox not found" |
60 | fi | 60 | fi |
61 | 61 | ||
62 | which chromium | 62 | which chromium 2>/dev/null |
63 | if [ "$?" -eq 0 ]; | 63 | if [ "$?" -eq 0 ]; |
64 | then | 64 | then |
65 | echo "TESTING: chromium x11" | 65 | echo "TESTING: chromium x11" |
@@ -68,7 +68,7 @@ else | |||
68 | echo "TESTING SKIP: chromium not found" | 68 | echo "TESTING SKIP: chromium not found" |
69 | fi | 69 | fi |
70 | 70 | ||
71 | which transmission-gtk | 71 | which transmission-gtk 2>/dev/null |
72 | if [ "$?" -eq 0 ]; | 72 | if [ "$?" -eq 0 ]; |
73 | then | 73 | then |
74 | echo "TESTING: transmission-gtk x11" | 74 | echo "TESTING: transmission-gtk x11" |
@@ -77,7 +77,7 @@ else | |||
77 | echo "TESTING SKIP: transmission-gtk not found" | 77 | echo "TESTING SKIP: transmission-gtk not found" |
78 | fi | 78 | fi |
79 | 79 | ||
80 | which thunderbird | 80 | which thunderbird 2>/dev/null |
81 | if [ "$?" -eq 0 ]; | 81 | if [ "$?" -eq 0 ]; |
82 | then | 82 | then |
83 | echo "TESTING: thunderbird x11" | 83 | echo "TESTING: thunderbird x11" |
diff --git a/test/apps/apps.sh b/test/apps/apps.sh index 4e0a9cc08..a3d0c4dc7 100755 --- a/test/apps/apps.sh +++ b/test/apps/apps.sh | |||
@@ -10,7 +10,7 @@ LIST="firefox midori chromium opera transmission-qt qbittorrent uget-gtk filezil | |||
10 | LIST+="vlc fbreader deluge gnome-mplayer xchat wine kcalc ktorrent hexchat" | 10 | LIST+="vlc fbreader deluge gnome-mplayer xchat wine kcalc ktorrent hexchat" |
11 | 11 | ||
12 | for app in $LIST; do | 12 | for app in $LIST; do |
13 | which $app | 13 | which $app 2>/dev/null |
14 | if [ "$?" -eq 0 ]; | 14 | if [ "$?" -eq 0 ]; |
15 | then | 15 | then |
16 | echo "TESTING: $app" | 16 | echo "TESTING: $app" |
diff --git a/test/arguments/arguments.sh b/test/arguments/arguments.sh index 049236900..9500b5975 100755 --- a/test/arguments/arguments.sh +++ b/test/arguments/arguments.sh | |||
@@ -4,9 +4,8 @@ if [ -f /etc/debian_version ]; then | |||
4 | libdir=$(dirname "$(dpkg -L firejail | grep faudit)") | 4 | libdir=$(dirname "$(dpkg -L firejail | grep faudit)") |
5 | export PATH="$PATH:$libdir" | 5 | export PATH="$PATH:$libdir" |
6 | else | 6 | else |
7 | export PATH="$PATH:/usr/lib/firejail" | 7 | export PATH="$PATH:/usr/lib/firejail:/usr/lib64/firejail" |
8 | fi | 8 | fi |
9 | export PATH="$PATH:/usr/lib/firejail" | ||
10 | 9 | ||
11 | echo "TESTING: 1. regular bash session" | 10 | echo "TESTING: 1. regular bash session" |
12 | ./bashrun.exp | 11 | ./bashrun.exp |
diff --git a/test/environment/environment.sh b/test/environment/environment.sh index 364a4b65b..97ba8ba58 100755 --- a/test/environment/environment.sh +++ b/test/environment/environment.sh | |||
@@ -38,7 +38,7 @@ echo "TESTING: environment variables (test/environment/env.exp)" | |||
38 | echo "TESTING: shell none(test/environment/shell-none.exp)" | 38 | echo "TESTING: shell none(test/environment/shell-none.exp)" |
39 | ./shell-none.exp | 39 | ./shell-none.exp |
40 | 40 | ||
41 | which dash | 41 | which dash 2>/dev/null |
42 | if [ "$?" -eq 0 ]; | 42 | if [ "$?" -eq 0 ]; |
43 | then | 43 | then |
44 | echo "TESTING: dash (test/environment/dash.exp)" | 44 | echo "TESTING: dash (test/environment/dash.exp)" |
@@ -47,7 +47,7 @@ else | |||
47 | echo "TESTING SKIP: dash not found" | 47 | echo "TESTING SKIP: dash not found" |
48 | fi | 48 | fi |
49 | 49 | ||
50 | which csh | 50 | which csh 2>/dev/null |
51 | if [ "$?" -eq 0 ]; | 51 | if [ "$?" -eq 0 ]; |
52 | then | 52 | then |
53 | echo "TESTING: csh (test/environment/csh.exp)" | 53 | echo "TESTING: csh (test/environment/csh.exp)" |
@@ -56,7 +56,7 @@ else | |||
56 | echo "TESTING SKIP: csh not found" | 56 | echo "TESTING SKIP: csh not found" |
57 | fi | 57 | fi |
58 | 58 | ||
59 | which zsh | 59 | which zsh 2>/dev/null |
60 | if [ "$?" -eq 0 ]; | 60 | if [ "$?" -eq 0 ]; |
61 | then | 61 | then |
62 | echo "TESTING: zsh (test/environment/zsh.exp)" | 62 | echo "TESTING: zsh (test/environment/zsh.exp)" |
@@ -68,7 +68,7 @@ fi | |||
68 | echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-in-firejail.exp)" | 68 | echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-in-firejail.exp)" |
69 | ./firejail-in-firejail.exp | 69 | ./firejail-in-firejail.exp |
70 | 70 | ||
71 | which aplay | 71 | which aplay 2>/dev/null |
72 | if [ "$?" -eq 0 ]; | 72 | if [ "$?" -eq 0 ]; |
73 | then | 73 | then |
74 | echo "TESTING: sound (test/environment/sound.exp)" | 74 | echo "TESTING: sound (test/environment/sound.exp)" |
@@ -83,7 +83,7 @@ echo "TESTING: nice (test/environment/nice.exp)" | |||
83 | echo "TESTING: quiet (test/environment/quiet.exp)" | 83 | echo "TESTING: quiet (test/environment/quiet.exp)" |
84 | ./quiet.exp | 84 | ./quiet.exp |
85 | 85 | ||
86 | which strace | 86 | which strace 2>/dev/null |
87 | if [ "$?" -eq 0 ]; | 87 | if [ "$?" -eq 0 ]; |
88 | then | 88 | then |
89 | echo "TESTING: --allow-debuggers (test/environment/allow-debuggers.exp)" | 89 | echo "TESTING: --allow-debuggers (test/environment/allow-debuggers.exp)" |
diff --git a/test/fcopy/fcopy.sh b/test/fcopy/fcopy.sh index 0e7cb2e5e..b225f9ea0 100755 --- a/test/fcopy/fcopy.sh +++ b/test/fcopy/fcopy.sh | |||
@@ -11,7 +11,7 @@ if [ -f /etc/debian_version ]; then | |||
11 | export PATH="$PATH:$libdir" | 11 | export PATH="$PATH:$libdir" |
12 | fi | 12 | fi |
13 | 13 | ||
14 | export PATH="$PATH:/usr/lib/firejail" | 14 | export PATH="$PATH:/usr/lib/firejail:/usr/lib64/firejail" |
15 | 15 | ||
16 | mkdir dest | 16 | mkdir dest |
17 | 17 | ||
diff --git a/test/filters/filters.sh b/test/filters/filters.sh index 97ecc8be0..ff197aa54 100755 --- a/test/filters/filters.sh +++ b/test/filters/filters.sh | |||
@@ -10,11 +10,9 @@ if [ -f /etc/debian_version ]; then | |||
10 | libdir=$(dirname "$(dpkg -L firejail | grep fseccomp)") | 10 | libdir=$(dirname "$(dpkg -L firejail | grep fseccomp)") |
11 | export PATH="$PATH:$libdir" | 11 | export PATH="$PATH:$libdir" |
12 | else | 12 | else |
13 | export PATH="$PATH:/usr/lib/firejail" | 13 | export PATH="$PATH:/usr/lib/firejail:/usr/lib64/firejail" |
14 | fi | 14 | fi |
15 | 15 | ||
16 | export PATH="$PATH:/usr/lib/firejail" | ||
17 | |||
18 | if [ "$(uname -m)" = "x86_64" ]; then | 16 | if [ "$(uname -m)" = "x86_64" ]; then |
19 | echo "TESTING: memory-deny-write-execute (test/filters/memwrexe.exp)" | 17 | echo "TESTING: memory-deny-write-execute (test/filters/memwrexe.exp)" |
20 | ./memwrexe.exp | 18 | ./memwrexe.exp |
@@ -79,7 +77,7 @@ echo "TESTING: seccomp errno (test/filters/seccomp-errno.exp)" | |||
79 | echo "TESTING: seccomp su (test/filters/seccomp-su.exp)" | 77 | echo "TESTING: seccomp su (test/filters/seccomp-su.exp)" |
80 | ./seccomp-su.exp | 78 | ./seccomp-su.exp |
81 | 79 | ||
82 | which strace | 80 | which strace 2>/dev/null |
83 | if [ $? -eq 0 ]; then | 81 | if [ $? -eq 0 ]; then |
84 | echo "TESTING: seccomp ptrace (test/filters/seccomp-ptrace.exp)" | 82 | echo "TESTING: seccomp ptrace (test/filters/seccomp-ptrace.exp)" |
85 | ./seccomp-ptrace.exp | 83 | ./seccomp-ptrace.exp |
diff --git a/test/fnetfilter/fnetfilter.sh b/test/fnetfilter/fnetfilter.sh index bae952ee9..aa2eb707a 100755 --- a/test/fnetfilter/fnetfilter.sh +++ b/test/fnetfilter/fnetfilter.sh | |||
@@ -11,7 +11,7 @@ if [ -f /etc/debian_version ]; then | |||
11 | export PATH="$PATH:$libdir" | 11 | export PATH="$PATH:$libdir" |
12 | fi | 12 | fi |
13 | 13 | ||
14 | export PATH="$PATH:/usr/lib/firejail" | 14 | export PATH="$PATH:/usr/lib/firejail:/usr/lib64/firejail" |
15 | 15 | ||
16 | chmod 400 outlocked | 16 | chmod 400 outlocked |
17 | 17 | ||
diff --git a/test/overlay/overlay.sh b/test/overlay/overlay.sh index 6b7f779d7..9daf1f5f6 100755 --- a/test/overlay/overlay.sh +++ b/test/overlay/overlay.sh | |||
@@ -21,7 +21,7 @@ rm -fr ~/_firejail_test_* | |||
21 | ./fs-tmpfs.exp | 21 | ./fs-tmpfs.exp |
22 | rm -fr ~/_firejail_test_* | 22 | rm -fr ~/_firejail_test_* |
23 | 23 | ||
24 | which firefox | 24 | which firefox 2>/dev/null |
25 | if [ "$?" -eq 0 ]; | 25 | if [ "$?" -eq 0 ]; |
26 | then | 26 | then |
27 | echo "TESTING: overlay firefox" | 27 | echo "TESTING: overlay firefox" |
@@ -30,7 +30,7 @@ else | |||
30 | echo "TESTING SKIP: firefox not found" | 30 | echo "TESTING SKIP: firefox not found" |
31 | fi | 31 | fi |
32 | 32 | ||
33 | which firefox | 33 | which firefox 2>/dev/null |
34 | if [ "$?" -eq 0 ]; | 34 | if [ "$?" -eq 0 ]; |
35 | then | 35 | then |
36 | echo "TESTING: overlay firefox x11 xorg" | 36 | echo "TESTING: overlay firefox x11 xorg" |
@@ -41,13 +41,13 @@ fi | |||
41 | 41 | ||
42 | 42 | ||
43 | # check xpra/xephyr | 43 | # check xpra/xephyr |
44 | which xpra | 44 | which xpra 2>/dev/null |
45 | if [ "$?" -eq 0 ]; | 45 | if [ "$?" -eq 0 ]; |
46 | then | 46 | then |
47 | echo "xpra found" | 47 | echo "xpra found" |
48 | else | 48 | else |
49 | echo "xpra not found" | 49 | echo "xpra not found" |
50 | which Xephyr | 50 | which Xephyr 2>/dev/null |
51 | if [ "$?" -eq 0 ]; | 51 | if [ "$?" -eq 0 ]; |
52 | then | 52 | then |
53 | echo "Xephyr found" | 53 | echo "Xephyr found" |
@@ -57,7 +57,7 @@ else | |||
57 | fi | 57 | fi |
58 | fi | 58 | fi |
59 | 59 | ||
60 | which firefox | 60 | which firefox 2>/dev/null |
61 | if [ "$?" -eq 0 ]; | 61 | if [ "$?" -eq 0 ]; |
62 | then | 62 | then |
63 | echo "TESTING: overlay firefox x11" | 63 | echo "TESTING: overlay firefox x11" |
diff --git a/test/private-lib/private-lib.sh b/test/private-lib/private-lib.sh index 312fe502a..2a0eb8d30 100755 --- a/test/private-lib/private-lib.sh +++ b/test/private-lib/private-lib.sh | |||
@@ -9,7 +9,7 @@ LIST="evince galculator gnome-calculator leafpad mousepad transmission-gtk xcalc | |||
9 | 9 | ||
10 | 10 | ||
11 | for app in $LIST; do | 11 | for app in $LIST; do |
12 | which $app | 12 | which $app 2>/dev/null |
13 | if [ "$?" -eq 0 ]; | 13 | if [ "$?" -eq 0 ]; |
14 | then | 14 | then |
15 | echo "TESTING: private-lib $app" | 15 | echo "TESTING: private-lib $app" |
diff --git a/test/root/root.sh b/test/root/root.sh index 4f217b727..a20142c5f 100755 --- a/test/root/root.sh +++ b/test/root/root.sh | |||
@@ -7,7 +7,7 @@ | |||
7 | #******************************** | 7 | #******************************** |
8 | # firecfg | 8 | # firecfg |
9 | #******************************** | 9 | #******************************** |
10 | which less | 10 | which less 2>/dev/null |
11 | if [ "$?" -eq 0 ]; | 11 | if [ "$?" -eq 0 ]; |
12 | then | 12 | then |
13 | echo "TESTING: firecfg (test/root/firecfg.exp)" | 13 | echo "TESTING: firecfg (test/root/firecfg.exp)" |
diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh index dd09e4533..6794af520 100755 --- a/test/sysutils/sysutils.sh +++ b/test/sysutils/sysutils.sh | |||
@@ -6,7 +6,7 @@ | |||
6 | export MALLOC_CHECK_=3 | 6 | export MALLOC_CHECK_=3 |
7 | export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) | 7 | export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) |
8 | 8 | ||
9 | which cpio | 9 | which cpio 2>/dev/null |
10 | if [ "$?" -eq 0 ]; | 10 | if [ "$?" -eq 0 ]; |
11 | then | 11 | then |
12 | echo "TESTING: cpio" | 12 | echo "TESTING: cpio" |
@@ -24,7 +24,7 @@ fi | |||
24 | # echo "TESTING SKIP: strings not found" | 24 | # echo "TESTING SKIP: strings not found" |
25 | #fi | 25 | #fi |
26 | 26 | ||
27 | which gzip | 27 | which gzip 2>/dev/null |
28 | if [ "$?" -eq 0 ]; | 28 | if [ "$?" -eq 0 ]; |
29 | then | 29 | then |
30 | echo "TESTING: gzip" | 30 | echo "TESTING: gzip" |
@@ -33,7 +33,7 @@ else | |||
33 | echo "TESTING SKIP: gzip not found" | 33 | echo "TESTING SKIP: gzip not found" |
34 | fi | 34 | fi |
35 | 35 | ||
36 | which xzdec | 36 | which xzdec 2>/dev/null |
37 | if [ "$?" -eq 0 ]; | 37 | if [ "$?" -eq 0 ]; |
38 | then | 38 | then |
39 | echo "TESTING: xzdec" | 39 | echo "TESTING: xzdec" |
@@ -42,7 +42,7 @@ else | |||
42 | echo "TESTING SKIP: xzdec not found" | 42 | echo "TESTING SKIP: xzdec not found" |
43 | fi | 43 | fi |
44 | 44 | ||
45 | which xz | 45 | which xz 2>/dev/null |
46 | if [ "$?" -eq 0 ]; | 46 | if [ "$?" -eq 0 ]; |
47 | then | 47 | then |
48 | echo "TESTING: xz" | 48 | echo "TESTING: xz" |
@@ -51,7 +51,7 @@ else | |||
51 | echo "TESTING SKIP: xz not found" | 51 | echo "TESTING SKIP: xz not found" |
52 | fi | 52 | fi |
53 | 53 | ||
54 | which less | 54 | which less 2>/dev/null |
55 | if [ "$?" -eq 0 ]; | 55 | if [ "$?" -eq 0 ]; |
56 | then | 56 | then |
57 | echo "TESTING: less" | 57 | echo "TESTING: less" |
@@ -60,7 +60,7 @@ else | |||
60 | echo "TESTING SKIP: less not found" | 60 | echo "TESTING SKIP: less not found" |
61 | fi | 61 | fi |
62 | 62 | ||
63 | which file | 63 | which file 2>/dev/null |
64 | if [ "$?" -eq 0 ]; | 64 | if [ "$?" -eq 0 ]; |
65 | then | 65 | then |
66 | echo "TESTING: file" | 66 | echo "TESTING: file" |
@@ -69,7 +69,7 @@ else | |||
69 | echo "TESTING SKIP: file not found" | 69 | echo "TESTING SKIP: file not found" |
70 | fi | 70 | fi |
71 | 71 | ||
72 | which tar | 72 | which tar 2>/dev/null |
73 | if [ "$?" -eq 0 ]; | 73 | if [ "$?" -eq 0 ]; |
74 | then | 74 | then |
75 | echo "TESTING: tar" | 75 | echo "TESTING: tar" |
@@ -78,7 +78,7 @@ else | |||
78 | echo "TESTING SKIP: tar not found" | 78 | echo "TESTING SKIP: tar not found" |
79 | fi | 79 | fi |
80 | 80 | ||
81 | which ping | 81 | which ping 2>/dev/null |
82 | if [ "$?" -eq 0 ]; | 82 | if [ "$?" -eq 0 ]; |
83 | then | 83 | then |
84 | echo "TESTING: ping" | 84 | echo "TESTING: ping" |
diff --git a/test/utils/utils.sh b/test/utils/utils.sh index 5438e11a8..d98e4c2e4 100755 --- a/test/utils/utils.sh +++ b/test/utils/utils.sh | |||
@@ -10,7 +10,7 @@ if [ -f /etc/debian_version ]; then | |||
10 | libdir=$(dirname "$(dpkg -L firejail | grep faudit)") | 10 | libdir=$(dirname "$(dpkg -L firejail | grep faudit)") |
11 | export PATH="$PATH:$libdir" | 11 | export PATH="$PATH:$libdir" |
12 | fi | 12 | fi |
13 | export PATH="$PATH:/usr/lib/firejail" | 13 | export PATH="$PATH:/usr/lib/firejail:/usr/lib64/firejail" |
14 | 14 | ||
15 | echo "testing" > ~/firejail-test-file-7699 | 15 | echo "testing" > ~/firejail-test-file-7699 |
16 | echo "testing" > /tmp/firejail-test-file-7699 | 16 | echo "testing" > /tmp/firejail-test-file-7699 |
@@ -39,7 +39,7 @@ echo "TESTING: version (test/utils/version.exp)" | |||
39 | echo "TESTING: help (test/utils/help.exp)" | 39 | echo "TESTING: help (test/utils/help.exp)" |
40 | ./help.exp | 40 | ./help.exp |
41 | 41 | ||
42 | which man | 42 | which man 2>/dev/null |
43 | if [ "$?" -eq 0 ]; | 43 | if [ "$?" -eq 0 ]; |
44 | then | 44 | then |
45 | echo "TESTING: man (test/utils/man.exp)" | 45 | echo "TESTING: man (test/utils/man.exp)" |