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(a)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 :|