We can't use "make distcheck" on OS-X because many unit tests fail. We
can still get coverage of some of the things "distcheck" validates, by
running the "install" and "dist" targets. This is particularly useful
because many conditional features are disabled on OS-X, and this helps
make sure we can still successfully install & dist when these bits are
disabled.

The default script is getting unreadable since it is all on one long
line. Rather than adding further conditional clauses to it, we make
use of the travis matrix config override for the script.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 .travis.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0cfdf80950..da9fe8af91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,11 @@ matrix:
       dist: trusty
     - compiler: clang
       os: osx
+      script:
+        # We can't run make distcheck/syntax-check because they
+        # fail on OS-X, but doing 'intsall' and 'dist' gives us
+        # some useful coverage
+        - make -j3 && make -j3 install && make -j3 dist
 
 addons:
   apt:
@@ -91,12 +96,10 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew upgrade && brew install rpcgen yajl; fi
 
 before_script:
-  - ./autogen.sh
+  - ./autogen.sh --prefix=$(pwd)/install-root
 
 script:
-  # Many unit tests still fail on macOS, and there are a bunch of issues with
-  # syntax-check as well, so skip those steps on that platform for now
-  - make -j3 && if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j3 syntax-check && make -j3 distcheck; fi
+  - make -j3 && make -j3 syntax-check && make -j3 distcheck
 
 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:
> We can't use "make distcheck" on OS-X because many unit tests fail. We

s/OS-X/macOS/g

There are a lot of instances both in the commit message and in the
Travis configuration, please make sure you replace all of them.

[...]
> @@ -10,6 +10,11 @@ matrix:
>        dist: trusty
>      - compiler: clang
>        os: osx
> +      script:
> +        # We can't run make distcheck/syntax-check because they
> +        # fail on OS-X, but doing 'intsall' and 'dist' gives us

s/intsall/install/


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:24:00PM +0100, Andrea Bolognani wrote:
> On Wed, 2018-02-28 at 14:55 +0000, Daniel P. Berrangé wrote:
> > We can't use "make distcheck" on OS-X because many unit tests fail. We
> 
> s/OS-X/macOS/g
> 
> There are a lot of instances both in the commit message and in the
> Travis configuration, please make sure you replace all of them.
> 
> [...]
> > @@ -10,6 +10,11 @@ matrix:
> >        dist: trusty
> >      - compiler: clang
> >        os: osx
> > +      script:
> > +        # We can't run make distcheck/syntax-check because they
> > +        # fail on OS-X, but doing 'intsall' and 'dist' gives us
> 
> s/intsall/install/
> 
> 
> Reviewed-by: Andrea Bolognani <abologna@redhat.com>

This isn't quite ready to push after all - it seems our current travis
setup for OS-X doesn't have an 'xz' binary installed causing dist to
fail. I'll need to figure out which (if any) package we can install to
get this binary.

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

On Wed, Feb 28, 2018 at 05:01:25PM +0000, Daniel P. Berrangé wrote:
> On Wed, Feb 28, 2018 at 04:24:00PM +0100, Andrea Bolognani wrote:
> > On Wed, 2018-02-28 at 14:55 +0000, Daniel P. Berrangé wrote:
> > > We can't use "make distcheck" on OS-X because many unit tests fail. We
> > 
> > s/OS-X/macOS/g
> > 
> > There are a lot of instances both in the commit message and in the
> > Travis configuration, please make sure you replace all of them.
> > 
> > [...]
> > > @@ -10,6 +10,11 @@ matrix:
> > >        dist: trusty
> > >      - compiler: clang
> > >        os: osx
> > > +      script:
> > > +        # We can't run make distcheck/syntax-check because they
> > > +        # fail on OS-X, but doing 'intsall' and 'dist' gives us
> > 
> > s/intsall/install/
> > 
> > 
> > Reviewed-by: Andrea Bolognani <abologna@redhat.com>
> 
> This isn't quite ready to push after all - it seems our current travis
> setup for OS-X doesn't have an 'xz' binary installed causing dist to
> fail. I'll need to figure out which (if any) package we can install to
> get this binary.

Turns out the brew package is simply called "xz" so I'll squash in

@@ -97,7 +97,7 @@ env:
     - VIR_TEST_DEBUG=1
 
 before_install:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew upgrade && brew install rpcgen yajl; fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew upgrade && brew install rpcgen yajl xz; fi
 
 before_script:
   - ./autogen.sh --prefix=$(pwd)/install-root

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