diff options
Diffstat (limited to 'test/overlay/overlay.sh')
-rwxr-xr-x | test/overlay/overlay.sh | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/test/overlay/overlay.sh b/test/overlay/overlay.sh index 490b180e1..a0519d1ad 100755 --- a/test/overlay/overlay.sh +++ b/test/overlay/overlay.sh | |||
@@ -22,8 +22,7 @@ rm -fr ~/_firejail_test_* | |||
22 | ./fs-tmpfs.exp | 22 | ./fs-tmpfs.exp |
23 | rm -fr ~/_firejail_test_* | 23 | rm -fr ~/_firejail_test_* |
24 | 24 | ||
25 | which firefox 2>/dev/null | 25 | if command -v firefox |
26 | if [ "$?" -eq 0 ]; | ||
27 | then | 26 | then |
28 | echo "TESTING: overlay firefox" | 27 | echo "TESTING: overlay firefox" |
29 | ./firefox.exp | 28 | ./firefox.exp |
@@ -31,8 +30,7 @@ else | |||
31 | echo "TESTING SKIP: firefox not found" | 30 | echo "TESTING SKIP: firefox not found" |
32 | fi | 31 | fi |
33 | 32 | ||
34 | which firefox 2>/dev/null | 33 | if command -v firefox |
35 | if [ "$?" -eq 0 ]; | ||
36 | then | 34 | then |
37 | echo "TESTING: overlay firefox x11 xorg" | 35 | echo "TESTING: overlay firefox x11 xorg" |
38 | ./firefox.exp | 36 | ./firefox.exp |
@@ -40,26 +38,22 @@ else | |||
40 | echo "TESTING SKIP: firefox not found" | 38 | echo "TESTING SKIP: firefox not found" |
41 | fi | 39 | fi |
42 | 40 | ||
43 | |||
44 | # check xpra/xephyr | 41 | # check xpra/xephyr |
45 | which xpra 2>/dev/null | 42 | if command -v xpra |
46 | if [ "$?" -eq 0 ]; | ||
47 | then | 43 | then |
48 | echo "xpra found" | 44 | echo "xpra found" |
49 | else | 45 | else |
50 | echo "xpra not found" | 46 | echo "xpra not found" |
51 | which Xephyr 2>/dev/null | 47 | if command -v Xephyr |
52 | if [ "$?" -eq 0 ]; | ||
53 | then | 48 | then |
54 | echo "Xephyr found" | 49 | echo "Xephyr found" |
55 | else | 50 | else |
56 | echo "TESTING SKIP: xpra and/or Xephyr not found" | 51 | echo "TESTING SKIP: xpra and/or Xephyr not found" |
57 | exit | 52 | exit |
58 | fi | 53 | fi |
59 | fi | 54 | fi |
60 | 55 | ||
61 | which firefox 2>/dev/null | 56 | if command -v firefox |
62 | if [ "$?" -eq 0 ]; | ||
63 | then | 57 | then |
64 | echo "TESTING: overlay firefox x11" | 58 | echo "TESTING: overlay firefox x11" |
65 | ./firefox-x11.exp | 59 | ./firefox-x11.exp |