diff options
Diffstat (limited to 'test/apps-x11')
-rwxr-xr-x | test/apps-x11/apps-x11.sh | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/test/apps-x11/apps-x11.sh b/test/apps-x11/apps-x11.sh index a3c946ca4..9f8102738 100755 --- a/test/apps-x11/apps-x11.sh +++ b/test/apps-x11/apps-x11.sh | |||
@@ -11,21 +11,18 @@ echo "TESTING: no x11 (test/apps-x11/x11-none.exp)" | |||
11 | ./x11-none.exp | 11 | ./x11-none.exp |
12 | 12 | ||
13 | 13 | ||
14 | which xterm 2>/dev/null | 14 | if command -v xterm |
15 | if [ "$?" -eq 0 ]; | ||
16 | then | 15 | then |
17 | echo "TESTING: xterm x11 xorg" | 16 | echo "TESTING: xterm x11 xorg" |
18 | ./xterm-xorg.exp | 17 | ./xterm-xorg.exp |
19 | 18 | ||
20 | which xpra 2>/dev/null | 19 | if command -v xpra |
21 | if [ "$?" -eq 0 ]; | ||
22 | then | 20 | then |
23 | echo "TESTING: xterm x11 xpra" | 21 | echo "TESTING: xterm x11 xpra" |
24 | ./xterm-xpra.exp | 22 | ./xterm-xpra.exp |
25 | fi | 23 | fi |
26 | 24 | ||
27 | which Xephyr 2>/dev/null | 25 | if command -v Xephyr |
28 | if [ "$?" -eq 0 ]; | ||
29 | then | 26 | then |
30 | echo "TESTING: xterm x11 xephyr" | 27 | echo "TESTING: xterm x11 xephyr" |
31 | ./xterm-xephyr.exp | 28 | ./xterm-xephyr.exp |
@@ -35,14 +32,12 @@ else | |||
35 | fi | 32 | fi |
36 | 33 | ||
37 | # check xpra/xephyr | 34 | # check xpra/xephyr |
38 | which xpra 2>/dev/null | 35 | if command -v xpra |
39 | if [ "$?" -eq 0 ]; | ||
40 | then | 36 | then |
41 | echo "xpra found" | 37 | echo "xpra found" |
42 | else | 38 | else |
43 | echo "xpra not found" | 39 | echo "xpra not found" |
44 | which Xephyr 2>/dev/null | 40 | if command -v Xephyr |
45 | if [ "$?" -eq 0 ]; | ||
46 | then | 41 | then |
47 | echo "Xephyr found" | 42 | echo "Xephyr found" |
48 | else | 43 | else |
@@ -51,8 +46,7 @@ else | |||
51 | fi | 46 | fi |
52 | fi | 47 | fi |
53 | 48 | ||
54 | which firefox 2>/dev/null | 49 | if command -v firefox |
55 | if [ "$?" -eq 0 ]; | ||
56 | then | 50 | then |
57 | echo "TESTING: firefox x11" | 51 | echo "TESTING: firefox x11" |
58 | ./firefox.exp | 52 | ./firefox.exp |
@@ -60,8 +54,7 @@ else | |||
60 | echo "TESTING SKIP: firefox not found" | 54 | echo "TESTING SKIP: firefox not found" |
61 | fi | 55 | fi |
62 | 56 | ||
63 | which chromium 2>/dev/null | 57 | if command -v chromium |
64 | if [ "$?" -eq 0 ]; | ||
65 | then | 58 | then |
66 | echo "TESTING: chromium x11" | 59 | echo "TESTING: chromium x11" |
67 | ./chromium.exp | 60 | ./chromium.exp |
@@ -69,8 +62,7 @@ else | |||
69 | echo "TESTING SKIP: chromium not found" | 62 | echo "TESTING SKIP: chromium not found" |
70 | fi | 63 | fi |
71 | 64 | ||
72 | which transmission-gtk 2>/dev/null | 65 | if command -v transmission-gtk |
73 | if [ "$?" -eq 0 ]; | ||
74 | then | 66 | then |
75 | echo "TESTING: transmission-gtk x11" | 67 | echo "TESTING: transmission-gtk x11" |
76 | ./transmission-gtk.exp | 68 | ./transmission-gtk.exp |
@@ -78,8 +70,7 @@ else | |||
78 | echo "TESTING SKIP: transmission-gtk not found" | 70 | echo "TESTING SKIP: transmission-gtk not found" |
79 | fi | 71 | fi |
80 | 72 | ||
81 | which thunderbird 2>/dev/null | 73 | if command -v thunderbird |
82 | if [ "$?" -eq 0 ]; | ||
83 | then | 74 | then |
84 | echo "TESTING: thunderbird x11" | 75 | echo "TESTING: thunderbird x11" |
85 | ./thunderbird.exp | 76 | ./thunderbird.exp |