diff options
author | 2016-04-30 07:08:50 -0400 | |
---|---|---|
committer | 2016-04-30 07:08:50 -0400 | |
commit | 899fcb0bfee5eb2853d00c317b4eca7b652606cf (patch) | |
tree | 30c4a52326f54c9c7b6b47850a2a2337460d7fae | |
parent | fix make dist (diff) | |
parent | Mark skipped tests differently (diff) | |
download | firejail-899fcb0bfee5eb2853d00c317b4eca7b652606cf.tar.gz firejail-899fcb0bfee5eb2853d00c317b4eca7b652606cf.tar.zst firejail-899fcb0bfee5eb2853d00c317b4eca7b652606cf.zip |
Merge pull request #490 from reinerh/master
Mark skipped tests differently
-rwxr-xr-x | test/apps-x11/apps-x11.sh | 10 | ||||
-rwxr-xr-x | test/apps/apps.sh | 32 | ||||
-rwxr-xr-x | test/environment/environment.sh | 8 | ||||
-rwxr-xr-x | test/utils/utils.sh | 4 |
4 files changed, 27 insertions, 27 deletions
diff --git a/test/apps-x11/apps-x11.sh b/test/apps-x11/apps-x11.sh index 2182c90a2..b01c37d0f 100755 --- a/test/apps-x11/apps-x11.sh +++ b/test/apps-x11/apps-x11.sh | |||
@@ -12,7 +12,7 @@ then | |||
12 | echo "TESTING: xterm x11" | 12 | echo "TESTING: xterm x11" |
13 | ./xterm.exp | 13 | ./xterm.exp |
14 | else | 14 | else |
15 | echo "TESTING: xterm not found" | 15 | echo "TESTING SKIP: xterm not found" |
16 | fi | 16 | fi |
17 | 17 | ||
18 | which firefox | 18 | which firefox |
@@ -21,7 +21,7 @@ then | |||
21 | echo "TESTING: firefox x11" | 21 | echo "TESTING: firefox x11" |
22 | ./firefox.exp | 22 | ./firefox.exp |
23 | else | 23 | else |
24 | echo "TESTING: firefox not found" | 24 | echo "TESTING SKIP: firefox not found" |
25 | fi | 25 | fi |
26 | 26 | ||
27 | which chromium | 27 | which chromium |
@@ -30,7 +30,7 @@ then | |||
30 | echo "TESTING: chromium x11" | 30 | echo "TESTING: chromium x11" |
31 | ./chromium.exp | 31 | ./chromium.exp |
32 | else | 32 | else |
33 | echo "TESTING: chromium not found" | 33 | echo "TESTING SKIP: chromium not found" |
34 | fi | 34 | fi |
35 | 35 | ||
36 | which transmission-gtk | 36 | which transmission-gtk |
@@ -39,7 +39,7 @@ then | |||
39 | echo "TESTING: transmission-gtk x11" | 39 | echo "TESTING: transmission-gtk x11" |
40 | ./transmission-gtk.exp | 40 | ./transmission-gtk.exp |
41 | else | 41 | else |
42 | echo "TESTING: transmission-gtk not found" | 42 | echo "TESTING SKIP: transmission-gtk not found" |
43 | fi | 43 | fi |
44 | 44 | ||
45 | which icedove | 45 | which icedove |
@@ -48,6 +48,6 @@ then | |||
48 | echo "TESTING: icedove x11" | 48 | echo "TESTING: icedove x11" |
49 | ./icedove.exp | 49 | ./icedove.exp |
50 | else | 50 | else |
51 | echo "TESTING: icedove not found" | 51 | echo "TESTING SKIP: icedove not found" |
52 | fi | 52 | fi |
53 | 53 | ||
diff --git a/test/apps/apps.sh b/test/apps/apps.sh index 2410a0d92..37d66d609 100755 --- a/test/apps/apps.sh +++ b/test/apps/apps.sh | |||
@@ -12,7 +12,7 @@ then | |||
12 | echo "TESTING: firefox" | 12 | echo "TESTING: firefox" |
13 | ./firefox.exp | 13 | ./firefox.exp |
14 | else | 14 | else |
15 | echo "TESTING: firefox not found" | 15 | echo "TESTING SKIP: firefox not found" |
16 | fi | 16 | fi |
17 | 17 | ||
18 | which midori | 18 | which midori |
@@ -21,7 +21,7 @@ then | |||
21 | echo "TESTING: midori" | 21 | echo "TESTING: midori" |
22 | ./midori.exp | 22 | ./midori.exp |
23 | else | 23 | else |
24 | echo "TESTING: midori not found" | 24 | echo "TESTING SKIP: midori not found" |
25 | fi | 25 | fi |
26 | 26 | ||
27 | which chromium | 27 | which chromium |
@@ -30,7 +30,7 @@ then | |||
30 | echo "TESTING: chromium" | 30 | echo "TESTING: chromium" |
31 | ./chromium.exp | 31 | ./chromium.exp |
32 | else | 32 | else |
33 | echo "TESTING: chromium not found" | 33 | echo "TESTING SKIP: chromium not found" |
34 | fi | 34 | fi |
35 | 35 | ||
36 | which opera | 36 | which opera |
@@ -39,7 +39,7 @@ then | |||
39 | echo "TESTING: opera" | 39 | echo "TESTING: opera" |
40 | ./opera.exp | 40 | ./opera.exp |
41 | else | 41 | else |
42 | echo "TESTING: opera not found" | 42 | echo "TESTING SKIP: opera not found" |
43 | fi | 43 | fi |
44 | 44 | ||
45 | which transmission-gtk | 45 | which transmission-gtk |
@@ -48,7 +48,7 @@ then | |||
48 | echo "TESTING: transmission-gtk" | 48 | echo "TESTING: transmission-gtk" |
49 | ./transmission-gtk.exp | 49 | ./transmission-gtk.exp |
50 | else | 50 | else |
51 | echo "TESTING: transmission-gtk not found" | 51 | echo "TESTING SKIP: transmission-gtk not found" |
52 | fi | 52 | fi |
53 | 53 | ||
54 | which transmission-qt | 54 | which transmission-qt |
@@ -57,7 +57,7 @@ then | |||
57 | echo "TESTING: transmission-qt" | 57 | echo "TESTING: transmission-qt" |
58 | ./transmission-qt.exp | 58 | ./transmission-qt.exp |
59 | else | 59 | else |
60 | echo "TESTING: transmission-qt not found" | 60 | echo "TESTING SKIP: transmission-qt not found" |
61 | fi | 61 | fi |
62 | 62 | ||
63 | which evince | 63 | which evince |
@@ -66,7 +66,7 @@ then | |||
66 | echo "TESTING: evince" | 66 | echo "TESTING: evince" |
67 | ./evince.exp | 67 | ./evince.exp |
68 | else | 68 | else |
69 | echo "TESTING: evince not found" | 69 | echo "TESTING SKIP: evince not found" |
70 | fi | 70 | fi |
71 | 71 | ||
72 | which icedove | 72 | which icedove |
@@ -75,7 +75,7 @@ then | |||
75 | echo "TESTING: icedove" | 75 | echo "TESTING: icedove" |
76 | ./icedove.exp | 76 | ./icedove.exp |
77 | else | 77 | else |
78 | echo "TESTING: icedove not found" | 78 | echo "TESTING SKIP: icedove not found" |
79 | fi | 79 | fi |
80 | 80 | ||
81 | which vlc | 81 | which vlc |
@@ -84,7 +84,7 @@ then | |||
84 | echo "TESTING: vlc" | 84 | echo "TESTING: vlc" |
85 | ./vlc.exp | 85 | ./vlc.exp |
86 | else | 86 | else |
87 | echo "TESTING: vlc not found" | 87 | echo "TESTING SKIP: vlc not found" |
88 | fi | 88 | fi |
89 | 89 | ||
90 | which fbreader | 90 | which fbreader |
@@ -93,7 +93,7 @@ then | |||
93 | echo "TESTING: fbreader" | 93 | echo "TESTING: fbreader" |
94 | ./fbreader.exp | 94 | ./fbreader.exp |
95 | else | 95 | else |
96 | echo "TESTING: fbreader not found" | 96 | echo "TESTING SKIP: fbreader not found" |
97 | fi | 97 | fi |
98 | 98 | ||
99 | which deluge | 99 | which deluge |
@@ -102,7 +102,7 @@ then | |||
102 | echo "TESTING: deluge" | 102 | echo "TESTING: deluge" |
103 | ./deluge.exp | 103 | ./deluge.exp |
104 | else | 104 | else |
105 | echo "TESTING: deluge not found" | 105 | echo "TESTING SKIP: deluge not found" |
106 | fi | 106 | fi |
107 | 107 | ||
108 | which gnome-mplayer | 108 | which gnome-mplayer |
@@ -111,7 +111,7 @@ then | |||
111 | echo "TESTING: gnome-mplayer" | 111 | echo "TESTING: gnome-mplayer" |
112 | ./gnome-mplayer.exp | 112 | ./gnome-mplayer.exp |
113 | else | 113 | else |
114 | echo "TESTING: gnome-mplayer not found" | 114 | echo "TESTING SKIP: gnome-mplayer not found" |
115 | fi | 115 | fi |
116 | 116 | ||
117 | which xchat | 117 | which xchat |
@@ -120,7 +120,7 @@ then | |||
120 | echo "TESTING: xchat" | 120 | echo "TESTING: xchat" |
121 | ./xchat.exp | 121 | ./xchat.exp |
122 | else | 122 | else |
123 | echo "TESTING: xchat not found" | 123 | echo "TESTING SKIP: xchat not found" |
124 | fi | 124 | fi |
125 | 125 | ||
126 | which hexchat | 126 | which hexchat |
@@ -129,7 +129,7 @@ then | |||
129 | echo "TESTING: hexchat" | 129 | echo "TESTING: hexchat" |
130 | ./hexchat.exp | 130 | ./hexchat.exp |
131 | else | 131 | else |
132 | echo "TESTING: hexchat not found" | 132 | echo "TESTING SKIP: hexchat not found" |
133 | fi | 133 | fi |
134 | 134 | ||
135 | which weechat-curses | 135 | which weechat-curses |
@@ -138,7 +138,7 @@ then | |||
138 | echo "TESTING: weechat" | 138 | echo "TESTING: weechat" |
139 | ./weechat.exp | 139 | ./weechat.exp |
140 | else | 140 | else |
141 | echo "TESTING: weechat not found" | 141 | echo "TESTING SKIP: weechat not found" |
142 | fi | 142 | fi |
143 | 143 | ||
144 | which wine | 144 | which wine |
@@ -147,6 +147,6 @@ then | |||
147 | echo "TESTING: wine" | 147 | echo "TESTING: wine" |
148 | ./wine.exp | 148 | ./wine.exp |
149 | else | 149 | else |
150 | echo "TESTING: wine not found" | 150 | echo "TESTING SKIP: wine not found" |
151 | fi | 151 | fi |
152 | 152 | ||
diff --git a/test/environment/environment.sh b/test/environment/environment.sh index 9164b43a2..7b29a3482 100755 --- a/test/environment/environment.sh +++ b/test/environment/environment.sh | |||
@@ -18,7 +18,7 @@ then | |||
18 | echo "TESTING: dash (test/environment/dash.exp)" | 18 | echo "TESTING: dash (test/environment/dash.exp)" |
19 | ./dash.exp | 19 | ./dash.exp |
20 | else | 20 | else |
21 | echo "TESTING: dash not found" | 21 | echo "TESTING SKIP: dash not found" |
22 | fi | 22 | fi |
23 | 23 | ||
24 | which csh | 24 | which csh |
@@ -27,7 +27,7 @@ then | |||
27 | echo "TESTING: csh (test/environment/csh.exp)" | 27 | echo "TESTING: csh (test/environment/csh.exp)" |
28 | ./csh.exp | 28 | ./csh.exp |
29 | else | 29 | else |
30 | echo "TESTING: csh not found" | 30 | echo "TESTING SKIP: csh not found" |
31 | fi | 31 | fi |
32 | 32 | ||
33 | which zsh | 33 | which zsh |
@@ -36,7 +36,7 @@ then | |||
36 | echo "TESTING: zsh (test/environment/zsh.exp)" | 36 | echo "TESTING: zsh (test/environment/zsh.exp)" |
37 | ./csh.exp | 37 | ./csh.exp |
38 | else | 38 | else |
39 | echo "TESTING: zsh not found" | 39 | echo "TESTING SKIP: zsh not found" |
40 | fi | 40 | fi |
41 | 41 | ||
42 | echo "TESTING: rlimit (test/environment/rlimit.exp)" | 42 | echo "TESTING: rlimit (test/environment/rlimit.exp)" |
@@ -57,7 +57,7 @@ then | |||
57 | echo "TESTING: sound (test/environment/sound.exp)" | 57 | echo "TESTING: sound (test/environment/sound.exp)" |
58 | ./sound.exp | 58 | ./sound.exp |
59 | else | 59 | else |
60 | echo "TESTING: aplay not found" | 60 | echo "TESTING SKIP: aplay not found" |
61 | fi | 61 | fi |
62 | 62 | ||
63 | echo "TESTING: nice (test/environment/nice.exp)" | 63 | echo "TESTING: nice (test/environment/nice.exp)" |
diff --git a/test/utils/utils.sh b/test/utils/utils.sh index 1e010147d..0428c4807 100755 --- a/test/utils/utils.sh +++ b/test/utils/utils.sh | |||
@@ -18,7 +18,7 @@ then | |||
18 | echo "TESTING: man (test/utils/man.exp)" | 18 | echo "TESTING: man (test/utils/man.exp)" |
19 | ./man.exp | 19 | ./man.exp |
20 | else | 20 | else |
21 | echo "TESTING: man not found" | 21 | echo "TESTING SKIP: man not found" |
22 | fi | 22 | fi |
23 | 23 | ||
24 | echo "TESTING: list (test/utils/list.exp)" | 24 | echo "TESTING: list (test/utils/list.exp)" |
@@ -32,7 +32,7 @@ then | |||
32 | echo "TESTING: cpu.print (test/utils/cpu-print.exp)" | 32 | echo "TESTING: cpu.print (test/utils/cpu-print.exp)" |
33 | ./cpu-print.exp | 33 | ./cpu-print.exp |
34 | else | 34 | else |
35 | echo "TESTING: cpu.print, not enough CPUs" | 35 | echo "TESTING SKIP: cpu.print, not enough CPUs" |
36 | fi | 36 | fi |
37 | 37 | ||
38 | echo "TESTING: fs.print (test/utils/fs-print.exp)" | 38 | echo "TESTING: fs.print (test/utils/fs-print.exp)" |