Enable testing of both the upstart and systemd init script handling.
We test a different one in each scenario. Even though trusty only
cares about systemd, it is fine for us to test rules that install
upstasrt, since we're not actually running these scripts for real.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index da9fe8af91..773cb522ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,12 @@ matrix:
   include:
     - compiler: gcc
       dist: trusty
+      env:
+        - DISTCHECK_CONFIGURE_ARGS="--with-init-script=upstart"
     - compiler: clang
       dist: trusty
+      env:
+        - DISTCHECK_CONFIGURE_ARGS="--with-init-script=systemd"
     - compiler: clang
       os: osx
       script:
@@ -99,7 +103,7 @@ before_script:
   - ./autogen.sh --prefix=$(pwd)/install-root
 
 script:
-  - make -j3 && make -j3 syntax-check && make -j3 distcheck
+  - make -j3 && make -j3 syntax-check && make -j3 distcheck DISTCHECK_CONFIGURE_ARGS=$DISTCHECK_CONFIGURE_ARGS
 
 after_failure:
   - echo '============================================================================'
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Wed, 2018-02-28 at 14:55 +0000, Daniel P. Berrangé wrote:
> Enable testing of both the upstart and systemd init script handling.
> We test a different one in each scenario. Even though trusty only
> cares about systemd,

This is incorrect: as pointed out earlier, trusty uses upstart.

> it is fine for us to test rules that install
> upstasrt, since we're not actually running these scripts for real.

s/upstasrt/upstart/

[...]
> @@ -99,7 +103,7 @@ before_script:
>    - ./autogen.sh --prefix=$(pwd)/install-root
>  
>  script:
> -  - make -j3 && make -j3 syntax-check && make -j3 distcheck
> +  - make -j3 && make -j3 syntax-check && make -j3 distcheck DISTCHECK_CONFIGURE_ARGS=$DISTCHECK_CONFIGURE_ARGS

s/DISTCHECK_CONFIGURE_ARGS/DISTCHECK_CONFIGURE_FLAGS/g

here and above, or it won't actually pick it up.


Reviewed-by: Andrea Bolognani <abologna@redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Wed, Feb 28, 2018 at 04:44:39PM +0100, Andrea Bolognani wrote:
> On Wed, 2018-02-28 at 14:55 +0000, Daniel P. Berrangé wrote:
> > Enable testing of both the upstart and systemd init script handling.
> > We test a different one in each scenario. Even though trusty only
> > cares about systemd,
> 
> This is incorrect: as pointed out earlier, trusty uses upstart.

Heh, yes I inverted the sentance :-)

> 
> > it is fine for us to test rules that install
> > upstasrt, since we're not actually running these scripts for real.
> 
> s/upstasrt/upstart/
> 
> [...]
> > @@ -99,7 +103,7 @@ before_script:
> >    - ./autogen.sh --prefix=$(pwd)/install-root
> >  
> >  script:
> > -  - make -j3 && make -j3 syntax-check && make -j3 distcheck
> > +  - make -j3 && make -j3 syntax-check && make -j3 distcheck DISTCHECK_CONFIGURE_ARGS=$DISTCHECK_CONFIGURE_ARGS
> 
> s/DISTCHECK_CONFIGURE_ARGS/DISTCHECK_CONFIGURE_FLAGS/g
> 
> here and above, or it won't actually pick it up.
> 
> 
> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
> 
> -- 
> Andrea Bolognani / Red Hat / Virtualization

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list