make testing

14 files changed, 52 insertions, 211 deletions

diff --git a/Makefile.in b/Makefile.in
index 93104bc02..c93fc401d 100644
--- 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 b/test/apps-x11/apps-x11.sh
index 93d984501..938d4c993 100755
--- a/test/test-apps-x11.sh
+++ b/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 b/test/apps-x11/chromium.exp
index bcac3233c..11677a28f 100755
--- a/test/chromium-x11.exp
+++ b/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 b/test/apps-x11/firefox.exp
index 7e30437db..f7c128690 100755
--- a/test/firefox-x11.exp
+++ b/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 b/test/apps-x11/icedove.exp
index 6f8eee90d..ca6a49978 100755
--- a/test/icedove-x11.exp
+++ b/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 b/test/apps-x11/transmission-gtk.exp
index 4ee3de701..67b3fd202 100755
--- a/test/transmission-gtk-x11.exp
+++ b/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 b/test/apps-x11/xterm.exp
index 592f77659..26e58953e 100755
--- a/test/xterm-x11.exp
+++ b/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
deleted file mode 100755
index 0fb7565af..000000000
--- a/test/auto/autotest.sh
+++ /dev/null
@@ -1,202 +0,0 @@
-#!/bin/bash
-
-arr[1]="TEST 1: svn and standard compilation"
-arr[2]="TEST 2: cppcheck"
-arr[3]="TEST 3: compile seccomp disabled, chroot disabled, bind disabled"
-arr[4]="TEST 4: rvtest"
-arr[5]="TEST 5: expect test as root, no malloc perturb"
-arr[6]="TEST 6: expect test as user, no malloc perturb"
-arr[7]="TEST 7: expect test as root, malloc perturb"
-arr[8]="TEST 8: expect test as user, malloc perturb"
-
-
-# remove previous reports and output file
-cleanup() {
-        rm -f out-test
-        rm -f output*
-        rm -f report*
-        rm -fr firejail-trunk
-}
-
-print_title() {
-        echo
-        echo
-        echo
-        echo "**************************************************"
-        echo $1
-        echo "**************************************************"
-}
-
-while [ $# -gt 0 ]; do    # Until you run out of parameters . . .
-    case "$1" in
-    --clean)
-        cleanup
-        exit
-        ;;
-    --help)
-        echo "./autotest.sh [--clean|--help]"
-        exit
-        ;;
-    esac
-    shift       # Check next set of parameters.
-done
-
-cleanup
-# enable sudo
-sudo ls -al
-
-#*****************************************************************
-# TEST 1
-#*****************************************************************
-# - checkout source code
-# - check compilation
-# - install
-#*****************************************************************
-print_title "${arr[1]}"
-svn checkout svn://svn.code.sf.net/p/firejail/code-0/trunk firejail-trunk
-cd firejail-trunk
-./configure --prefix=/usr 2>&1 | tee ../output-configure
-make -j4 2>&1 | tee ../output-make
-sudo make install 2>&1 | tee ../output-install
-cd src/tools
-gcc -o rvtest rvtest.c
-cd ../..
-cd test
-sudo ./configure > /dev/null
-cd ../..
-grep warning output-configure output-make output-install > ./report-test1
-grep error output-configure output-make output-install >> ./report-test1
-cat report-test1 > out-test1
-
-#*****************************************************************
-# TEST 2
-#*****************************************************************
-# - run cppcheck
-#*****************************************************************
-print_title "${arr[2]}"
-cd firejail-trunk
-cp /home/netblue/bin/cfg/std.cfg .
-cppcheck --force . 2>&1 | tee ../output-cppcheck
-cd ..
-grep error output-cppcheck > report-test2
-cat report-test2 > out-test2
-
-#*****************************************************************
-# TEST 3
-#*****************************************************************
-# - disable seccomp configuration
-# - check compilation
-#*****************************************************************
-print_title "${arr[3]}"
-# seccomp
-cd firejail-trunk
-make distclean
-./configure --prefix=/usr --disable-seccomp 2>&1 | tee ../output-configure-noseccomp
-make -j4 2>&1 | tee ../output-make-noseccomp
-cd ..
-grep warning output-configure-noseccomp output-make-noseccomp > ./report-test3
-grep error output-configure-noseccomp output-make-noseccomp >> ./report-test3
-# chroot
-cd firejail-trunk
-make distclean
-./configure --prefix=/usr --disable-chroot 2>&1 | tee ../output-configure-nochroot
-make -j4 2>&1 | tee ../output-make-nochroot
-cd ..
-grep warning output-configure-nochroot output-make-nochroot >> ./report-test3
-grep error output-configure-nochroot output-make-nochroot >> ./report-test3
-# bind
-cd firejail-trunk
-make distclean
-./configure --prefix=/usr --disable-bind 2>&1 | tee ../output-configure-nobind
-make -j4 2>&1 | tee ../output-make-nobind
-cd ..
-grep warning output-configure-nobind output-make-nobind >> ./report-test3
-grep error output-configure-nobind output-make-nobind >> ./report-test3
-# save result
-cat report-test3 > out-test3
-
-#*****************************************************************
-# TEST 4
-#*****************************************************************
-# - rvtest
-#*****************************************************************
-print_title "${arr[4]}"
-cd firejail-trunk
-cd test
-../src/tools/rvtest test.rv 2>/dev/null | tee ../../output-test4 | grep TESTING
-cd ../..
-grep TESTING output-test4 > ./report-test4
-grep ERROR report-test4 > out-test4
-
-
-#*****************************************************************
-# TEST 5
-#*****************************************************************
-# - expect test as root, no malloc perturb
-#*****************************************************************
-print_title "${arr[5]}"
-cd firejail-trunk/test
-sudo ./test-root.sh 2>&1 | tee ../../output-test5 | grep TESTING
-cd ../..
-grep TESTING output-test5 > ./report-test5
-grep ERROR report-test5 > out-test5
-
-#*****************************************************************
-# TEST 6
-#*****************************************************************
-# - expect test as user, no malloc perturb
-#*****************************************************************
-print_title "${arr[6]}"
-cd firejail-trunk/test
-./test.sh 2>&1 | tee ../../output-test6 | grep TESTING
-cd ../..
-grep TESTING output-test6 > ./report-test6
-grep ERROR report-test6 > out-test6
-
-
-
-#*****************************************************************
-# TEST 7
-#*****************************************************************
-# - expect test as root, malloc perturb
-#*****************************************************************
-print_title "${arr[7]}"
-export MALLOC_CHECK_=3
-export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
-cd firejail-trunk/test
-sudo ./test-root.sh 2>&1 | tee ../../output-test7 | grep TESTING
-cd ../..
-grep TESTING output-test7 > ./report-test7
-grep ERROR report-test7 > out-test7
-
-#*****************************************************************
-# TEST 8
-#*****************************************************************
-# - expect test as user, malloc perturb
-#*****************************************************************
-print_title "${arr[8]}"
-cd firejail-trunk/test
-./test.sh 2>&1 | tee ../../output-test8| grep TESTING
-cd ../..
-grep TESTING output-test8 > ./report-test8
-grep ERROR report-test8 > out-test8
-
-#*****************************************************************
-# PRINT REPORTS
-#*****************************************************************
-echo
-echo
-echo
-echo
-echo "**********************************************************"
-echo "TEST RESULTS"
-echo "**********************************************************"
-
-wc -l out-test*
-rm out-test*
-echo
-
-
-
-
-exit
diff --git a/test/firemon-caps.exp b/test/firemon/caps.exp
index 3dd6384db..ab1067921 100755
--- a/test/firemon-caps.exp
+++ b/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 b/test/firemon/caps1.profile
index e14655b2e..e14655b2e 100644
--- a/test/caps1.profile
+++ b/test/firemon/caps1.profile
diff --git a/test/caps2.profile b/test/firemon/caps2.profile
index cb2258c52..cb2258c52 100644
--- a/test/caps2.profile
+++ b/test/firemon/caps2.profile
diff --git a/test/firemon/firemon.sh b/test/firemon/firemon.sh
new file mode 100755
index 000000000..edd548526
--- /dev/null
+++ 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 b/test/firemon/seccomp.exp
index 55817faf3..a318e39b1 100755
--- a/test/firemon-seccomp.exp
+++ b/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
index 24827de9f..c88b8d486 100755
--- 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