make test-profiles

9 files changed, 33 insertions, 18 deletions

diff --git a/Makefile.in b/Makefile.in
index dfeea565b..8bf9d68a9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -239,6 +239,7 @@ dist:
         cd $(NAME)-$(VERSION); cp -a ../src .; cp -a ../etc .; cp -a ../platform .; rm -fr src/tools; cd ..
         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); rm -fr `find . -name .svn`; rm -fr $(NAME)-$(VERSION); cd ..
         tar -cjvf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)
         rm -fr $(NAME)-$(VERSION)
@@ -258,5 +259,9 @@ cppcheck: clean
 
 scan-build: clean
         scan-build make
+
 asc:; ./mkasc.sh $(VERSION)
 
+test-profiles:
+        cd test/profiles; ./profiles.sh | grep TESTING
+
diff --git a/test/profile_syntax.exp b/test/profiles/profile_syntax.exp
index 559947276..ecad1043b 100755
--- a/test/profile_syntax.exp
+++ b/test/profiles/profile_syntax.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/profile_syntax2.exp b/test/profiles/profile_syntax2.exp
index 96e85ba93..ba83731be 100755
--- a/test/profile_syntax2.exp
+++ b/test/profiles/profile_syntax2.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/profiles/profiles.sh b/test/profiles/profiles.sh
new file mode 100755
index 000000000..ea1f51c1a
--- /dev/null
+++ b/test/profiles/profiles.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2016 Firejail Authors
+# License GPL v2
+
+echo "TESTING: default profiles installed in /etc"
+PROFILES=`ls /etc/firejail/*.profile`
+for PROFILE in $PROFILES
+do
+        echo "TESTING: $PROFILE"
+        ./test-profile.exp $PROFILE
+done
+
+echo "TESTING: profile syntax (profiles/profile_syntax.exp)"
+./profile_syntax.exp
+
+echo "TESTING: profile syntax 2 (profiles/profile_syntax2.exp)"
+./profile_syntax2.exp
+
diff --git a/test/test-profile.exp b/test/profiles/test-profile.exp
index a03e8db31..590b42652 100755
--- a/test/test-profile.exp
+++ b/test/profiles/test-profile.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.profile b/test/profiles/test.profile
index 1d69cc960..1d69cc960 100644
--- a/test/test.profile
+++ b/test/profiles/test.profile
diff --git a/test/test2.profile b/test/profiles/test2.profile
index d7e1a1f21..d7e1a1f21 100644
--- a/test/test2.profile
+++ b/test/profiles/test2.profile
diff --git a/test/test-profiles.sh b/test/test-profiles.sh
deleted file mode 100755
index d9142885b..000000000
--- a/test/test-profiles.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-echo "TESTING: default profiles installed in /etc"
-PROFILES=`ls /etc/firejail/*.profile`
-for PROFILE in $PROFILES
-do
-        echo "TESTING: $PROFILE"
-        ./test-profile.exp $PROFILE
-done
-
diff --git a/test/test.sh b/test/test.sh
index 961b48807..0fa26d86d 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -2,8 +2,6 @@
 
 ./chk_config.exp
 
-./test-profiles.sh
-
 ./fscheck.sh
 
 echo "TESTING: cpu.print (cpu-print.exp)"
@@ -220,12 +218,6 @@ echo "TESTING: output (output.exp)"
 echo "TESTING: profile no permissions (profile_noperm.exp)"
 ./profile_noperm.exp
 
-echo "TESTING: profile syntax (profile_syntax.exp)"
-./profile_syntax.exp
-
-echo "TESTING: profile syntax 2 (profile_syntax2.exp)"
-./profile_syntax2.exp
-
 echo "TESTING: profile rlimit (profile_rlimit.exp)"
 ./profile_rlimit.exp