make test-apps

20 files changed, 12 insertions, 10 deletions

diff --git a/Makefile.in b/Makefile.in
index 8bf9d68a9..fbe9b24c4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -240,6 +240,7 @@ dist:
         cd $(NAME)-$(VERSION); cp -a ../configure .; cp -a ../configure.ac .; cp -a ../Makefile.in .; cp -a ../install.sh .; cp -a ../mkman.sh .; cp -a ../mketc.sh .; cp -a ../mkdeb.sh .;cd ..
         cd $(NAME)-$(VERSION); cp -a ../COPYING .; cp -a ../README .; cp -a ../RELNOTES .; cd ..
         cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/profiles test/.; cd ..
+        cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/apps test/.; cd ..
         cd $(NAME)-$(VERSION); rm -fr `find . -name .svn`; rm -fr $(NAME)-$(VERSION); cd ..
         tar -cjvf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)
         rm -fr $(NAME)-$(VERSION)
@@ -265,3 +266,8 @@ asc:; ./mkasc.sh $(VERSION)
 test-profiles:
         cd test/profiles; ./profiles.sh | grep TESTING
 
+test-apps:
+        cd test/apps; ./apps.sh | grep TESTING
+
+test: test-profiles test-apps
+        echo "TEST COMPLETE"
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 @@
 #!/bin/bash
 
+export MALLOC_CHECK_=3
+export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
+
 which firefox
 if [ "$?" -eq 0 ];
 then
@@ -27,15 +30,6 @@ else
         echo "TESTING: chromium not found"
 fi
 
-which google-chrome
-if [ "$?" -eq 0 ];
-then
-        echo "TESTING: google-chrome"
-        ./chromium.exp
-else
-        echo "TESTING: google-chrome not found"
-fi
-
 which opera
 if [ "$?" -eq 0 ];
 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 @@
 # Copyright (C) 2014-2016 Firejail Authors
 # License GPL v2
 
+export MALLOC_CHECK_=3
+export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
+
 echo "TESTING: default profiles installed in /etc"
 PROFILES=`ls /etc/firejail/*.profile`
 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
         echo "TESTING: dash not found"
 fi
 
-./test-apps.sh
 ./test-apps-x11.sh
 
 echo "TESTING: PID (pid.exp)"