adding test-profiles to ci test

netblue30 · Nov 8, 2020 · bc068c6 · bc068c6
1 parent 26ad51d
commit bc068c6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -240,7 +240,7 @@ test: test-profiles test-private-lib test-fcopy test-fnetfilter test-fs test-uti
 test-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
  echo "TEST COMPLETE"
 
-test-github: test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-arguments
+test-github: test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-arguments
  echo "TEST COMPLETE"
 
 ##########################################

diff --git 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)"
 echo "TESTING: profile no permissions (test/profiles/profile_noperm.exp)"
 ./profile_noperm.exp
 
+# GitHub CI doesn't have a /run/user/$UID directory. Using it to test a small number of profiles.
+UID=`id -u`
+if [ -d "/run/user/$UID" ]; then
+ PROFILES=`ls /etc/firejail/*.profile`
+ echo "TESTING: default profiles installed in /etc"
+else
+ PROFILES=`ls /etc/firejail/f*.profile`
+ echo "TESTING: small number of default profiles installed in /etc"
+fi
 
-
-
-echo "TESTING: default profiles installed in /etc"
-PROFILES=`ls /etc/firejail/*.profile`
 for PROFILE in $PROFILES
 do
  echo "TESTING: $PROFILE"