diff options
Diffstat (limited to 'test')
-rwxr-xr-x | test/apps/apps.sh (renamed from test/test-apps.sh) | 12 | ||||
-rwxr-xr-x | test/apps/chromium.exp (renamed from test/chromium.exp) | 0 | ||||
-rwxr-xr-x | test/apps/deluge.exp (renamed from test/deluge.exp) | 0 | ||||
-rwxr-xr-x | test/apps/evince.exp (renamed from test/evince.exp) | 0 | ||||
-rwxr-xr-x | test/apps/fbreader.exp (renamed from test/fbreader.exp) | 0 | ||||
-rwxr-xr-x | test/apps/firefox.exp (renamed from test/firefox.exp) | 0 | ||||
-rwxr-xr-x | test/apps/gnome-mplayer.exp (renamed from test/gnome-mplayer.exp) | 0 | ||||
-rwxr-xr-x | test/apps/hexchat.exp (renamed from test/hexchat.exp) | 0 | ||||
-rwxr-xr-x | test/apps/icedove.exp (renamed from test/icedove.exp) | 0 | ||||
-rwxr-xr-x | test/apps/midori.exp (renamed from test/midori.exp) | 0 | ||||
-rwxr-xr-x | test/apps/opera.exp (renamed from test/opera.exp) | 0 | ||||
-rwxr-xr-x | test/apps/transmission-gtk.exp (renamed from test/transmission-gtk.exp) | 0 | ||||
-rwxr-xr-x | test/apps/transmission-qt.exp (renamed from test/transmission-qt.exp) | 0 | ||||
-rwxr-xr-x | test/apps/vlc.exp (renamed from test/vlc.exp) | 0 | ||||
-rwxr-xr-x | test/apps/weechat.exp (renamed from test/weechat.exp) | 0 | ||||
-rwxr-xr-x | test/apps/wine.exp (renamed from test/wine.exp) | 0 | ||||
-rwxr-xr-x | test/apps/xchat.exp (renamed from test/xchat.exp) | 0 | ||||
-rwxr-xr-x | test/profiles/profiles.sh | 3 | ||||
-rwxr-xr-x | test/test.sh | 1 |
19 files changed, 6 insertions, 10 deletions
diff --git a/test/test-apps.sh b/test/apps/apps.sh index 5ada20549..ff561ef31 100755 --- a/test/test-apps.sh +++ b/test/apps/apps.sh | |||
@@ -1,5 +1,8 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | 2 | ||
3 | export MALLOC_CHECK_=3 | ||
4 | export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) | ||
5 | |||
3 | which firefox | 6 | which firefox |
4 | if [ "$?" -eq 0 ]; | 7 | if [ "$?" -eq 0 ]; |
5 | then | 8 | then |
@@ -27,15 +30,6 @@ else | |||
27 | echo "TESTING: chromium not found" | 30 | echo "TESTING: chromium not found" |
28 | fi | 31 | fi |
29 | 32 | ||
30 | which google-chrome | ||
31 | if [ "$?" -eq 0 ]; | ||
32 | then | ||
33 | echo "TESTING: google-chrome" | ||
34 | ./chromium.exp | ||
35 | else | ||
36 | echo "TESTING: google-chrome not found" | ||
37 | fi | ||
38 | |||
39 | which opera | 33 | which opera |
40 | if [ "$?" -eq 0 ]; | 34 | if [ "$?" -eq 0 ]; |
41 | then | 35 | then |
diff --git a/test/chromium.exp b/test/apps/chromium.exp index 676f7e314..676f7e314 100755 --- a/test/chromium.exp +++ b/test/apps/chromium.exp | |||
diff --git a/test/deluge.exp b/test/apps/deluge.exp index 9f5063495..9f5063495 100755 --- a/test/deluge.exp +++ b/test/apps/deluge.exp | |||
diff --git a/test/evince.exp b/test/apps/evince.exp index 3c3ad4bdd..3c3ad4bdd 100755 --- a/test/evince.exp +++ b/test/apps/evince.exp | |||
diff --git a/test/fbreader.exp b/test/apps/fbreader.exp index d2bee880e..d2bee880e 100755 --- a/test/fbreader.exp +++ b/test/apps/fbreader.exp | |||
diff --git a/test/firefox.exp b/test/apps/firefox.exp index 2585e4b5c..2585e4b5c 100755 --- a/test/firefox.exp +++ b/test/apps/firefox.exp | |||
diff --git a/test/gnome-mplayer.exp b/test/apps/gnome-mplayer.exp index 6965322fc..6965322fc 100755 --- a/test/gnome-mplayer.exp +++ b/test/apps/gnome-mplayer.exp | |||
diff --git a/test/hexchat.exp b/test/apps/hexchat.exp index 7e99c8cdf..7e99c8cdf 100755 --- a/test/hexchat.exp +++ b/test/apps/hexchat.exp | |||
diff --git a/test/icedove.exp b/test/apps/icedove.exp index 344febb93..344febb93 100755 --- a/test/icedove.exp +++ b/test/apps/icedove.exp | |||
diff --git a/test/midori.exp b/test/apps/midori.exp index 470f5de77..470f5de77 100755 --- a/test/midori.exp +++ b/test/apps/midori.exp | |||
diff --git a/test/opera.exp b/test/apps/opera.exp index 23eed5504..23eed5504 100755 --- a/test/opera.exp +++ b/test/apps/opera.exp | |||
diff --git a/test/transmission-gtk.exp b/test/apps/transmission-gtk.exp index 1acfc6f94..1acfc6f94 100755 --- a/test/transmission-gtk.exp +++ b/test/apps/transmission-gtk.exp | |||
diff --git a/test/transmission-qt.exp b/test/apps/transmission-qt.exp index 944fd28a2..944fd28a2 100755 --- a/test/transmission-qt.exp +++ b/test/apps/transmission-qt.exp | |||
diff --git a/test/vlc.exp b/test/apps/vlc.exp index 290c0fc2f..290c0fc2f 100755 --- a/test/vlc.exp +++ b/test/apps/vlc.exp | |||
diff --git a/test/weechat.exp b/test/apps/weechat.exp index 630af55ee..630af55ee 100755 --- a/test/weechat.exp +++ b/test/apps/weechat.exp | |||
diff --git a/test/wine.exp b/test/apps/wine.exp index f5b7d12b4..f5b7d12b4 100755 --- a/test/wine.exp +++ b/test/apps/wine.exp | |||
diff --git a/test/xchat.exp b/test/apps/xchat.exp index cde89d754..cde89d754 100755 --- a/test/xchat.exp +++ b/test/apps/xchat.exp | |||
diff --git a/test/profiles/profiles.sh b/test/profiles/profiles.sh index ea1f51c1a..a20ed5432 100755 --- a/test/profiles/profiles.sh +++ b/test/profiles/profiles.sh | |||
@@ -3,6 +3,9 @@ | |||
3 | # Copyright (C) 2014-2016 Firejail Authors | 3 | # Copyright (C) 2014-2016 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | export MALLOC_CHECK_=3 | ||
7 | export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) | ||
8 | |||
6 | echo "TESTING: default profiles installed in /etc" | 9 | echo "TESTING: default profiles installed in /etc" |
7 | PROFILES=`ls /etc/firejail/*.profile` | 10 | PROFILES=`ls /etc/firejail/*.profile` |
8 | for PROFILE in $PROFILES | 11 | for PROFILE in $PROFILES |
diff --git a/test/test.sh b/test/test.sh index 0fa26d86d..1204d8208 100755 --- a/test/test.sh +++ b/test/test.sh | |||
@@ -206,7 +206,6 @@ else | |||
206 | echo "TESTING: dash not found" | 206 | echo "TESTING: dash not found" |
207 | fi | 207 | fi |
208 | 208 | ||
209 | ./test-apps.sh | ||
210 | ./test-apps-x11.sh | 209 | ./test-apps-x11.sh |
211 | 210 | ||
212 | echo "TESTING: PID (pid.exp)" | 211 | echo "TESTING: PID (pid.exp)" |