.travis.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
Since the s390x containers do not allow KVM, we only compile-test
the --disable-tcg build on s390x and do not run the qtests. Thus,
it does not make sense to install genisoimage here, and it also does
not make sense to build the s390-ccw.img here again - it is simply
not used without the qtests.
On the other hand, if we do not build the s390-ccw.img anymore, we
can also compile with Clang - so let's use that compiler here to
get some additional test coverage.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.travis.yml | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index fe708792ca..1ec8a7b465 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -502,9 +502,10 @@ jobs:
$(exit $BUILD_RC);
fi
- - name: "[s390x] GCC check (KVM)"
+ - name: "[s390x] Clang (disable-tcg)"
arch: s390x
dist: bionic
+ compiler: clang
addons:
apt_packages:
- libaio-dev
@@ -528,21 +529,10 @@ jobs:
- libusb-1.0-0-dev
- libvdeplug-dev
- libvte-2.91-dev
- # Tests dependencies
- - genisoimage
env:
- TEST_CMD="make check-unit"
- - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools"
- script:
- - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF )
- - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
- - |
- if [ "$BUILD_RC" -eq 0 ] ; then
- mv pc-bios/s390-ccw/*.img pc-bios/ ;
- ${TEST_CMD} ;
- else
- $(exit $BUILD_RC);
- fi
+ - CONFIG="--disable-containers --disable-tcg --enable-kvm
+ --disable-tools --host-cc=clang --cxx=clang++"
# Release builds
# The make-release script expect a QEMU version, so our tag must start with a 'v'.
--
2.18.1
On 5/12/20 3:38 PM, Thomas Huth wrote: > Since the s390x containers do not allow KVM, we only compile-test > the --disable-tcg build on s390x and do not run the qtests. Thus, > it does not make sense to install genisoimage here, and it also does > not make sense to build the s390-ccw.img here again - it is simply > not used without the qtests. > On the other hand, if we do not build the s390-ccw.img anymore, we > can also compile with Clang - so let's use that compiler here to > get some additional test coverage. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > .travis.yml | 18 ++++-------------- > 1 file changed, 4 insertions(+), 14 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index fe708792ca..1ec8a7b465 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -502,9 +502,10 @@ jobs: > $(exit $BUILD_RC); > fi > > - - name: "[s390x] GCC check (KVM)" > + - name: "[s390x] Clang (disable-tcg)" Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > arch: s390x > dist: bionic > + compiler: clang > addons: > apt_packages: > - libaio-dev > @@ -528,21 +529,10 @@ jobs: > - libusb-1.0-0-dev > - libvdeplug-dev > - libvte-2.91-dev > - # Tests dependencies > - - genisoimage > env: > - TEST_CMD="make check-unit" > - - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools" > - script: > - - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) > - - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? > - - | > - if [ "$BUILD_RC" -eq 0 ] ; then > - mv pc-bios/s390-ccw/*.img pc-bios/ ; > - ${TEST_CMD} ; > - else > - $(exit $BUILD_RC); > - fi > + - CONFIG="--disable-containers --disable-tcg --enable-kvm > + --disable-tools --host-cc=clang --cxx=clang++" > > # Release builds > # The make-release script expect a QEMU version, so our tag must start with a 'v'. >
Thomas Huth <thuth@redhat.com> writes: > Since the s390x containers do not allow KVM, we only compile-test > the --disable-tcg build on s390x and do not run the qtests. Thus, > it does not make sense to install genisoimage here, and it also does > not make sense to build the s390-ccw.img here again - it is simply > not used without the qtests. > On the other hand, if we do not build the s390-ccw.img anymore, we > can also compile with Clang - so let's use that compiler here to > get some additional test coverage. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Queued to testing/next, thanks. > --- > .travis.yml | 18 ++++-------------- > 1 file changed, 4 insertions(+), 14 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index fe708792ca..1ec8a7b465 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -502,9 +502,10 @@ jobs: > $(exit $BUILD_RC); > fi > > - - name: "[s390x] GCC check (KVM)" > + - name: "[s390x] Clang (disable-tcg)" > arch: s390x > dist: bionic > + compiler: clang > addons: > apt_packages: > - libaio-dev > @@ -528,21 +529,10 @@ jobs: > - libusb-1.0-0-dev > - libvdeplug-dev > - libvte-2.91-dev > - # Tests dependencies > - - genisoimage > env: > - TEST_CMD="make check-unit" > - - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools" > - script: > - - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) > - - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? > - - | > - if [ "$BUILD_RC" -eq 0 ] ; then > - mv pc-bios/s390-ccw/*.img pc-bios/ ; > - ${TEST_CMD} ; > - else > - $(exit $BUILD_RC); > - fi > + - CONFIG="--disable-containers --disable-tcg --enable-kvm > + --disable-tools --host-cc=clang --cxx=clang++" > > # Release builds > # The make-release script expect a QEMU version, so our tag must start with a 'v'. -- Alex Bennée
On Tue, 12 May 2020 15:38:49 +0200 Thomas Huth <thuth@redhat.com> wrote: > Since the s390x containers do not allow KVM, we only compile-test > the --disable-tcg build on s390x and do not run the qtests. Thus, > it does not make sense to install genisoimage here, and it also does > not make sense to build the s390-ccw.img here again - it is simply > not used without the qtests. > On the other hand, if we do not build the s390-ccw.img anymore, we > can also compile with Clang - so let's use that compiler here to > get some additional test coverage. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > .travis.yml | 18 ++++-------------- > 1 file changed, 4 insertions(+), 14 deletions(-) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
© 2016 - 2024 Red Hat, Inc.