Change CI tests to drop DIRECT_INITRC.

This option is no longer common now that Red Hat and Debian are systemd,
and Gentoo never used it.
This commit is contained in:
Chris PeBenito 2015-05-22 14:29:46 -04:00
parent 74bc8b3a55
commit bd994e2a58

View File

@ -5,24 +5,24 @@ python:
- "2.7"
env:
- TYPE=standard DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=y
- TYPE=standard DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=n
- TYPE=standard DISTRO=debian DIRECT_INITRC=y MONOLITHIC=y
- TYPE=standard DISTRO=debian DIRECT_INITRC=y MONOLITHIC=n
- TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y
- TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mcs DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mcs DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mcs DISTRO=debian DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mcs DISTRO=debian DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mls DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mls DISTRO=redhat DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mls DISTRO=debian DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mls DISTRO=debian DIRECT_INITRC=y MONOLITHIC=n
- TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=y
- TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n
- TYPE=standard DISTRO=redhat MONOLITHIC=y
- TYPE=standard DISTRO=redhat MONOLITHIC=n
- TYPE=standard DISTRO=debian MONOLITHIC=y
- TYPE=standard DISTRO=debian MONOLITHIC=n
- TYPE=standard DISTRO=gentoo MONOLITHIC=y
- TYPE=standard DISTRO=gentoo MONOLITHIC=n
- TYPE=mcs DISTRO=redhat MONOLITHIC=y
- TYPE=mcs DISTRO=redhat MONOLITHIC=n
- TYPE=mcs DISTRO=debian MONOLITHIC=y
- TYPE=mcs DISTRO=debian MONOLITHIC=n
- TYPE=mcs DISTRO=gentoo MONOLITHIC=y
- TYPE=mcs DISTRO=gentoo MONOLITHIC=n
- TYPE=mls DISTRO=redhat MONOLITHIC=y
- TYPE=mls DISTRO=redhat MONOLITHIC=n
- TYPE=mls DISTRO=debian MONOLITHIC=y
- TYPE=mls DISTRO=debian MONOLITHIC=n
- TYPE=mls DISTRO=gentoo MONOLITHIC=y
- TYPE=mls DISTRO=gentoo MONOLITHIC=n
before_install:
- lsb_release -a
@ -50,10 +50,10 @@ before_install:
- sudo make CFLAGS="-O2 -pipe -fPIC -Wall" -C selinux-src install
# Drop build.conf settings to listen to env vars
- sed -r -i -e '/(DIRECT_INITRC|MONOLITHIC|TYPE|DISTRO)/d' build.conf
- sed -r -i -e '/(MONOLITHIC|TYPE|DISTRO)/d' build.conf
script:
- echo $TYPE $DISTRO $DIRECT_INITRC $MONOLITHIC
- echo $TYPE $DISTRO $MONOLITHIC
- make bare
- make conf
- make