commit: 18ab255a88e32bf5a90ebee26ad957117645358d
Author: Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Sun Apr 28 10:34:36 2019 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 10:43:03 2019 +0000
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=18ab255a
.travis.yml: Remove DIRECT_INITRC from test matrix
commit 53db187a5aa702c59b8905509536c56c2867b3a8
init: Revise conditions in init_startstop_service().
broke DIRECT_INITRC=y, and it is not supported on Gentoo anyway,
so just drop it from the test matrix.
Signed-off-by: Jason Zaman <jason <AT> perfinion.com>
.travis.yml | 40 ++++++++++++++--------------------------
1 file changed, 14 insertions(+), 26 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5f2360bd..a79aee8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,30 +8,18 @@ matrix:
# for T in standard mls mcs ; do for D in arch debian gentoo ; do for I in n y
; do for M in y n ; do for S in n y ; do
# echo " - TYPE=$T DISTRO=$D DIRECT_INITRC=$I MONOLITHIC=$M SYSTEMD=$S" ;
done ; done ; done ; done ; done
env:
- - TYPE=standard DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=n WERROR=y
- - TYPE=standard DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=y WERROR=y
- - TYPE=standard DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=n WERROR=y
- - TYPE=standard DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=y WERROR=y
- - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=n WERROR=y
- - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=y WERROR=y
- - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=n WERROR=y
- - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=y WERROR=y
- - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=n WERROR=y
- - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=y WERROR=y
- - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=n WERROR=y
- - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=y WERROR=y
- - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=n WERROR=y
- - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=y WERROR=y
- - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=n WERROR=y
- - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=y WERROR=y
- - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=n WERROR=y
- - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=y SYSTEMD=y WERROR=y
- - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=n WERROR=y
- - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n SYSTEMD=y WERROR=y
- - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=n WERROR=y
- - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y SYSTEMD=y WERROR=y
- - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=n WERROR=y
- - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n SYSTEMD=y WERROR=y
+ - TYPE=standard DISTRO=gentoo MONOLITHIC=n SYSTEMD=n WERROR=y
+ - TYPE=standard DISTRO=gentoo MONOLITHIC=n SYSTEMD=y WERROR=y
+ - TYPE=standard DISTRO=gentoo MONOLITHIC=y SYSTEMD=n WERROR=y
+ - TYPE=standard DISTRO=gentoo MONOLITHIC=y SYSTEMD=y WERROR=y
+ - TYPE=mcs DISTRO=gentoo MONOLITHIC=n SYSTEMD=n WERROR=y
+ - TYPE=mcs DISTRO=gentoo MONOLITHIC=n SYSTEMD=y WERROR=y
+ - TYPE=mcs DISTRO=gentoo MONOLITHIC=y SYSTEMD=n WERROR=y
+ - TYPE=mcs DISTRO=gentoo MONOLITHIC=y SYSTEMD=y WERROR=y
+ - TYPE=mls DISTRO=gentoo MONOLITHIC=n SYSTEMD=n WERROR=y
+ - TYPE=mls DISTRO=gentoo MONOLITHIC=n SYSTEMD=y WERROR=y
+ - TYPE=mls DISTRO=gentoo MONOLITHIC=y SYSTEMD=n WERROR=y
+ - TYPE=mls DISTRO=gentoo MONOLITHIC=y SYSTEMD=y WERROR=y
sudo: false
dist: trusty
@@ -92,10 +80,10 @@ install:
- export TEST_TOOLCHAIN="${TRAVIS_BUILD_DIR}/selinux"
# Drop build.conf settings to listen to env vars
- - sed -r -i -e '/(DIRECT_INITRC|MONOLITHIC|TYPE|DISTRO|SYSTEMD|WERROR)/d'
build.conf
+ - sed -r -i -e '/(MONOLITHIC|TYPE|DISTRO|SYSTEMD|WERROR)/d' build.conf
script:
- - echo $TYPE $DISTRO $DIRECT_INITRC $MONOLITHIC $SYSTEMD $WERROR
+ - echo $TYPE $DISTRO $MONOLITHIC $SYSTEMD $WERROR
- set -e
- make bare
- make conf
