diff options
author | Reiner Herrmann <reiner@reiner-h.de> | 2016-04-28 00:02:53 +0200 |
---|---|---|
committer | Reiner Herrmann <reiner@reiner-h.de> | 2016-04-28 01:29:07 +0200 |
commit | dbb0b361a3abb95745372ba626c4427277b72ccc (patch) | |
tree | 81beb5d2d2408c1081c566bb11149cf15e007a11 /test/utils/utils.sh | |
parent | testing (diff) | |
download | firejail-dbb0b361a3abb95745372ba626c4427277b72ccc.tar.gz firejail-dbb0b361a3abb95745372ba626c4427277b72ccc.tar.zst firejail-dbb0b361a3abb95745372ba626c4427277b72ccc.zip |
Make some tests more robust
Diffstat (limited to 'test/utils/utils.sh')
-rwxr-xr-x | test/utils/utils.sh | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/test/utils/utils.sh b/test/utils/utils.sh index 474c026d1..1e010147d 100755 --- a/test/utils/utils.sh +++ b/test/utils/utils.sh | |||
@@ -12,8 +12,14 @@ echo "TESTING: version (test/utils/version.exp)" | |||
12 | echo "TESTING: help (test/utils/help.exp)" | 12 | echo "TESTING: help (test/utils/help.exp)" |
13 | ./help.exp | 13 | ./help.exp |
14 | 14 | ||
15 | echo "TESTING: man (test/utils/man.exp)" | 15 | which man |
16 | ./man.exp | 16 | if [ "$?" -eq 0 ]; |
17 | then | ||
18 | echo "TESTING: man (test/utils/man.exp)" | ||
19 | ./man.exp | ||
20 | else | ||
21 | echo "TESTING: man not found" | ||
22 | fi | ||
17 | 23 | ||
18 | echo "TESTING: list (test/utils/list.exp)" | 24 | echo "TESTING: list (test/utils/list.exp)" |
19 | ./list.exp | 25 | ./list.exp |
@@ -21,9 +27,13 @@ echo "TESTING: list (test/utils/list.exp)" | |||
21 | echo "TESTING: tree (test/utils/tree.exp)" | 27 | echo "TESTING: tree (test/utils/tree.exp)" |
22 | ./tree.exp | 28 | ./tree.exp |
23 | 29 | ||
24 | echo "TESTING: cpu.print (test/utils/cpu-print.exp)" | 30 | if [ $(grep -c ^processor /proc/cpuinfo) -gt 1 ]; |
25 | echo "TESTING: failing under VirtualBox where there is only one CPU" | 31 | then |
26 | ./cpu-print.exp | 32 | echo "TESTING: cpu.print (test/utils/cpu-print.exp)" |
33 | ./cpu-print.exp | ||
34 | else | ||
35 | echo "TESTING: cpu.print, not enough CPUs" | ||
36 | fi | ||
27 | 37 | ||
28 | echo "TESTING: fs.print (test/utils/fs-print.exp)" | 38 | echo "TESTING: fs.print (test/utils/fs-print.exp)" |
29 | ./fs-print.exp | 39 | ./fs-print.exp |
@@ -52,7 +62,7 @@ echo "TESTING: shutdown3 (test/utils/shutdown3.exp)" | |||
52 | echo "TESTING: shutdown4 (test/utils/shutdown4.exp)" | 62 | echo "TESTING: shutdown4 (test/utils/shutdown4.exp)" |
53 | ./shutdown4.exp | 63 | ./shutdown4.exp |
54 | 64 | ||
55 | echo "TESTING: join test/utils/(join.exp)" | 65 | echo "TESTING: join (test/utils/join.exp)" |
56 | ./join.exp | 66 | ./join.exp |
57 | 67 | ||
58 | echo "TESTING: join2 (test/utils/join2.exp)" | 68 | echo "TESTING: join2 (test/utils/join2.exp)" |
@@ -72,9 +82,9 @@ rm -f index.html* | |||
72 | echo "TESTING: firemon --seccomp (test/utils/seccomp.exp)" | 82 | echo "TESTING: firemon --seccomp (test/utils/seccomp.exp)" |
73 | ./seccomp.exp | 83 | ./seccomp.exp |
74 | 84 | ||
75 | echo "TESTING: firemon --caps (test/ustil/caps.exp)" | 85 | echo "TESTING: firemon --caps (test/utils/caps.exp)" |
76 | ./caps.exp | 86 | ./caps.exp |
77 | 87 | ||
78 | echo "TESTING: file transfer (test/ustil/ls.exp)" | 88 | echo "TESTING: file transfer (test/utils/ls.exp)" |
79 | ./ls.exp | 89 | ./ls.exp |
80 | 90 | ||