make test-apps

netblue30 · Apr 22, 2016 · 47be574 · 47be574
1 parent bec09e5
commit 47be574
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 10 deletions.
diff --git 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 → test/apps/apps.sh b/test/test-apps.sh → 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 → test/apps/chromium.exp b/test/chromium.exp → test/apps/chromium.exp
diff --git a/test/deluge.exp → test/apps/deluge.exp b/test/deluge.exp → test/apps/deluge.exp
diff --git a/test/evince.exp → test/apps/evince.exp b/test/evince.exp → test/apps/evince.exp
diff --git a/test/fbreader.exp → test/apps/fbreader.exp b/test/fbreader.exp → test/apps/fbreader.exp
diff --git a/test/firefox.exp → test/apps/firefox.exp b/test/firefox.exp → test/apps/firefox.exp
diff --git a/test/gnome-mplayer.exp → test/apps/gnome-mplayer.exp b/test/gnome-mplayer.exp → test/apps/gnome-mplayer.exp
diff --git a/test/hexchat.exp → test/apps/hexchat.exp b/test/hexchat.exp → test/apps/hexchat.exp
diff --git a/test/icedove.exp → test/apps/icedove.exp b/test/icedove.exp → test/apps/icedove.exp
diff --git a/test/midori.exp → test/apps/midori.exp b/test/midori.exp → test/apps/midori.exp
diff --git a/test/opera.exp → test/apps/opera.exp b/test/opera.exp → test/apps/opera.exp
diff --git a/test/transmission-gtk.exp → test/apps/transmission-gtk.exp b/test/transmission-gtk.exp → test/apps/transmission-gtk.exp
diff --git a/test/transmission-qt.exp → test/apps/transmission-qt.exp b/test/transmission-qt.exp → test/apps/transmission-qt.exp
diff --git a/test/vlc.exp → test/apps/vlc.exp b/test/vlc.exp → test/apps/vlc.exp
diff --git a/test/weechat.exp → test/apps/weechat.exp b/test/weechat.exp → test/apps/weechat.exp
diff --git a/test/wine.exp → test/apps/wine.exp b/test/wine.exp → test/apps/wine.exp
diff --git a/test/xchat.exp → test/apps/xchat.exp b/test/xchat.exp → test/apps/xchat.exp
diff --git 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
@@ -206,7 +206,6 @@ else
  echo "TESTING: dash not found"
 fi
 
-./test-apps.sh
 ./test-apps-x11.sh
 
 echo "TESTING: PID (pid.exp)"