aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2020-11-08 09:37:22 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2020-11-08 09:37:22 -0500
commitbc068c6745767b7567eb89570418357fd4b5cf26 (patch)
tree1288d687fae6990de8795302716009bba21a81af
parentfull ci test (diff)
downloadfirejail-bc068c6745767b7567eb89570418357fd4b5cf26.tar.gz
firejail-bc068c6745767b7567eb89570418357fd4b5cf26.tar.zst
firejail-bc068c6745767b7567eb89570418357fd4b5cf26.zip
adding test-profiles to ci test
-rw-r--r--Makefile.in2
-rwxr-xr-xtest/profiles/profiles.sh13
2 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 169b1f8cb..623c8bd39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -240,7 +240,7 @@ test: test-profiles test-private-lib test-fcopy test-fnetfilter test-fs test-uti
240test-noprofiles: test-private-lib test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments 240test-noprofiles: test-private-lib test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments
241 echo "TEST COMPLETE" 241 echo "TEST COMPLETE"
242 242
243test-github: test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-arguments 243test-github: test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-arguments
244 echo "TEST COMPLETE" 244 echo "TEST COMPLETE"
245 245
246########################################## 246##########################################
diff --git a/test/profiles/profiles.sh b/test/profiles/profiles.sh
index 69f0dc086..47717f1e0 100755
--- a/test/profiles/profiles.sh
+++ b/test/profiles/profiles.sh
@@ -34,11 +34,16 @@ echo "TESTING: profile read-only links (test/profiles/profile_readonly.exp)"
34echo "TESTING: profile no permissions (test/profiles/profile_noperm.exp)" 34echo "TESTING: profile no permissions (test/profiles/profile_noperm.exp)"
35./profile_noperm.exp 35./profile_noperm.exp
36 36
37# GitHub CI doesn't have a /run/user/$UID directory. Using it to test a small number of profiles.
38UID=`id -u`
39if [ -d "/run/user/$UID" ]; then
40 PROFILES=`ls /etc/firejail/*.profile`
41 echo "TESTING: default profiles installed in /etc"
42else
43 PROFILES=`ls /etc/firejail/f*.profile`
44 echo "TESTING: small number of default profiles installed in /etc"
45fi
37 46
38
39
40echo "TESTING: default profiles installed in /etc"
41PROFILES=`ls /etc/firejail/*.profile`
42for PROFILE in $PROFILES 47for PROFILE in $PROFILES
43do 48do
44 echo "TESTING: $PROFILE" 49 echo "TESTING: $PROFILE"