aboutsummaryrefslogtreecommitdiffstats
path: root/test/overlay/overlay.sh
diff options
context:
space:
mode:
Diffstat (limited to 'test/overlay/overlay.sh')
-rwxr-xr-xtest/overlay/overlay.sh15
1 files changed, 5 insertions, 10 deletions
diff --git a/test/overlay/overlay.sh b/test/overlay/overlay.sh
index 490b180e1..9bc458f50 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
23rm -fr ~/_firejail_test_* 23rm -fr ~/_firejail_test_*
24 24
25which firefox 2>/dev/null 25if command -v firefox
26if [ "$?" -eq 0 ];
27then 26then
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"
32fi 31fi
33 32
34which firefox 2>/dev/null 33if command -v firefox
35if [ "$?" -eq 0 ];
36then 34then
37 echo "TESTING: overlay firefox x11 xorg" 35 echo "TESTING: overlay firefox x11 xorg"
38 ./firefox.exp 36 ./firefox.exp
@@ -42,14 +40,12 @@ fi
42 40
43 41
44# check xpra/xephyr 42# check xpra/xephyr
45which xpra 2>/dev/null 43if command -v xpra
46if [ "$?" -eq 0 ];
47then 44then
48 echo "xpra found" 45 echo "xpra found"
49else 46else
50 echo "xpra not found" 47 echo "xpra not found"
51 which Xephyr 2>/dev/null 48 if command -v Xephyr
52 if [ "$?" -eq 0 ];
53 then 49 then
54 echo "Xephyr found" 50 echo "Xephyr found"
55 else 51 else
@@ -58,8 +54,7 @@ else
58 fi 54 fi
59fi 55fi
60 56
61which firefox 2>/dev/null 57if command -v firefox
62if [ "$?" -eq 0 ];
63then 58then
64 echo "TESTING: overlay firefox x11" 59 echo "TESTING: overlay firefox x11"
65 ./firefox-x11.exp 60 ./firefox-x11.exp