| Message ID | 20200207113939.9247-6-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next (rcutorture and misc tweaks) | expand |
On 2/7/20 12:39 PM, Alex Bennée wrote: > From: Thomas Huth <thuth@redhat.com> > > Since we can now use a s390x host on Travis, we can also build and > test the s390-ccw bios images there. For this we have to make sure > that roms/SLOF is checked out, too, and then move the generated *.img > files to the right location before running the tests. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Message-Id: <20200206202543.7085-1-thuth@redhat.com> > --- > .travis.yml | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/.travis.yml b/.travis.yml > index 6c0ec6cf69f..c0eeff9caa9 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -508,6 +508,16 @@ matrix: > env: > - TEST_CMD="make check check-tcg V=1" > - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" > + 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 > > # Release builds > # The make-release script expect a QEMU version, so our tag must start with a 'v'. > Already reviewed/tested [*] with comment: Maybe remove the trailing ", too" in subject... Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> [*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg677641.html
On Wed, 12 Feb 2020 21:48:42 +0100 Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > On 2/7/20 12:39 PM, Alex Bennée wrote: > > From: Thomas Huth <thuth@redhat.com> > > > > Since we can now use a s390x host on Travis, we can also build and > > test the s390-ccw bios images there. For this we have to make sure > > that roms/SLOF is checked out, too, and then move the generated *.img > > files to the right location before running the tests. > > > > Signed-off-by: Thomas Huth <thuth@redhat.com> > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > > Message-Id: <20200206202543.7085-1-thuth@redhat.com> > > --- > > .travis.yml | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > Already reviewed/tested [*] with comment: > > Maybe remove the trailing ", too" in subject... > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > [*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg677641.html > Hm, I also gave an Acked-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/.travis.yml b/.travis.yml index 6c0ec6cf69f..c0eeff9caa9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -508,6 +508,16 @@ matrix: env: - TEST_CMD="make check check-tcg V=1" - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" + 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 # Release builds # The make-release script expect a QEMU version, so our tag must start with a 'v'.