make testing

kmk3 · Apr 23, 2016 · 7e1c057 · 7e1c057
1 parent 2169ead
commit 7e1c057
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 211 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -243,6 +243,8 @@ dist:
 	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); mkdir -p test; cp -a ../test/utils test/.; cd ..
+	cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/apps-x11 test/.; cd ..
+	cd $(NAME)-$(VERSION); mkdir -p test; cp -a ../test/firemon 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)
@@ -271,8 +273,14 @@ test-profiles:
 test-apps:
 	cd test/apps; ./apps.sh | grep TESTING
 
+test-apps-x11:
+	cd test/apps-x11; ./apps-x11.sh | grep TESTING
+
+test-firemon:
+	cd test/firemon; ./firemon.sh | grep TESTING
+
 test-utils:
 	cd test/utils; ./utils.sh | grep TESTING
 
-test: test-profiles test-utils test-apps 
+test: test-profiles test-utils test-apps test-apps-x11 test-firemon
 	echo "TEST COMPLETE"
diff --git a/test/test-apps-x11.sh → test/apps-x11/apps-x11.sh b/test/test-apps-x11.sh → test/apps-x11/apps-x11.sh
@@ -1,10 +1,16 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
+
+export MALLOC_CHECK_=3
+export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 
 which xterm
 if [ "$?" -eq 0 ];
 then
 	echo "TESTING: xterm x11"
-	./xterm-x11.exp
+	./xterm.exp
 else
 	echo "TESTING: xterm not found"
 fi
@@ -13,7 +19,7 @@ which firefox
 if [ "$?" -eq 0 ];
 then
 	echo "TESTING: firefox x11"
-	./firefox-x11.exp
+	./firefox.exp
 else
 	echo "TESTING: firefox not found"
 fi
@@ -22,7 +28,7 @@ which chromium
 if [ "$?" -eq 0 ];
 then
 	echo "TESTING: chromium x11"
-	./chromium-x11.exp
+	./chromium.exp
 else
 	echo "TESTING: chromium not found"
 fi
@@ -31,7 +37,7 @@ which transmission-gtk
 if [ "$?" -eq 0 ];
 then
 	echo "TESTING: transmission-gtk x11"
-	./transmission-gtk-x11.exp
+	./transmission-gtk.exp
 else
 	echo "TESTING: transmission-gtk not found"
 fi
@@ -40,8 +46,8 @@ which icedove
 if [ "$?" -eq 0 ];
 then
 	echo "TESTING: icedove x11"
-	./icedove-x11.exp
+	./icedove.exp
 else
-	echo "TESTING: chromium not found"
+	echo "TESTING: icedovenot found"
 fi
 
diff --git a/test/chromium-x11.exp → test/apps-x11/chromium.exp b/test/chromium-x11.exp → test/apps-x11/chromium.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)

diff --git a/test/firefox-x11.exp → test/apps-x11/firefox.exp b/test/firefox-x11.exp → test/apps-x11/firefox.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)

diff --git a/test/icedove-x11.exp → test/apps-x11/icedove.exp b/test/icedove-x11.exp → test/apps-x11/icedove.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)

diff --git a/test/transmission-gtk-x11.exp → test/apps-x11/transmission-gtk.exp b/test/transmission-gtk-x11.exp → test/apps-x11/transmission-gtk.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)

diff --git a/test/xterm-x11.exp → test/apps-x11/xterm.exp b/test/xterm-x11.exp → test/apps-x11/xterm.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)

diff --git a/test/auto/autotest.sh b/test/auto/autotest.sh
diff --git a/test/firemon-caps.exp → test/firemon/caps.exp b/test/firemon-caps.exp → test/firemon/caps.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)

diff --git a/test/caps1.profile → test/firemon/caps1.profile b/test/caps1.profile → test/firemon/caps1.profile
diff --git a/test/caps2.profile → test/firemon/caps2.profile b/test/caps2.profile → test/firemon/caps2.profile
diff --git a/test/firemon/firemon.sh b/test/firemon/firemon.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
+
+echo "TESTING: firemon --seccomp (test/firemon/seccomp.exp)"
+./seccomp.exp
+
+echo "TESTING: firemon --caps (test/firemon/caps.exp)"
+./caps.exp
diff --git a/test/firemon-seccomp.exp → test/firemon/seccomp.exp b/test/firemon-seccomp.exp → test/firemon/seccomp.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
 
 set timeout 10
 spawn $env(SHELL)

diff --git a/test/test.sh b/test/test.sh
@@ -171,8 +171,6 @@ else
         echo "TESTING: dash not found"
 fi
 
-./test-apps-x11.sh
-
 echo "TESTING: PID (pid.exp)"
 ./pid.exp