| Message ID | 20210217202036.1724901-72-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | TCI fixes and cleanups | expand |
On 17/02/2021 21.20, Richard Henderson wrote: > We're currently only testing TCI with a 64-bit host -- also test > with a 32-bit host. Enable a selection of softmmu and user-only > targets, 32-bit LE, 64-bit LE, 32-bit BE, as there are ifdefs for each. > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > .gitlab-ci.d/crossbuilds.yml | 17 ++++++++++++++--- > .../docker/dockerfiles/fedora-i386-cross.docker | 1 + > 2 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml > index 66547b6683..99300f786b 100644 > --- a/.gitlab-ci.d/crossbuilds.yml > +++ b/.gitlab-ci.d/crossbuilds.yml > @@ -6,7 +6,8 @@ > - mkdir build > - cd build > - PKG_CONFIG_PATH=$PKG_CONFIG_PATH > - ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-user > + ../configure --enable-werror $QEMU_CONFIGURE_OPTS $ACCEL_CONFIGURE_OPTS I'd maybe call it EXTRA_CONFIGURE_OPTS instead since it could also be used for other purposes later. > + --disable-user > --target-list-exclude="arm-softmmu cris-softmmu i386-softmmu > microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu > ppc-softmmu sh4-softmmu xtensa-softmmu" > @@ -27,7 +28,7 @@ > - PKG_CONFIG_PATH=$PKG_CONFIG_PATH > ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-tools > --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS > - - make -j$(expr $(nproc) + 1) all check-build > + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS > > .cross_user_build_job: > stage: build > @@ -36,7 +37,8 @@ > - mkdir build > - cd build > - PKG_CONFIG_PATH=$PKG_CONFIG_PATH > - ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-system > + ../configure --enable-werror $QEMU_CONFIGURE_OPTS $ACCEL_CONFIGURE_OPTS > + --disable-system > - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS > > cross-armel-system: > @@ -81,6 +83,15 @@ cross-i386-user: > IMAGE: fedora-i386-cross > MAKE_CHECK_ARGS: check > > +cross-i386-tci: > + extends: .cross_accel_build_job > + timeout: 60m > + variables: > + IMAGE: fedora-i386-cross > + ACCEL: tcg-interpreter > + ACCEL_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,aarch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user > + MAKE_CHECK_ARGS: check Don't you want to run "check-tcg" here, too? (IIRC it's not included in "check") > cross-mips-system: > extends: .cross_system_build_job > variables: > diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker > index a6e411291b..aa66314c65 100644 > --- a/tests/docker/dockerfiles/fedora-i386-cross.docker > +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker > @@ -5,6 +5,7 @@ ENV PACKAGES \ > findutils \ > gcc \ > git \ > + libffi-devel.i686 \ > libtasn1-devel.i686 \ > libzstd-devel.i686 \ > make \ > Anyway, Acked-by: Thomas Huth <thuth@redhat.com>
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 66547b6683..99300f786b 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -6,7 +6,8 @@ - mkdir build - cd build - PKG_CONFIG_PATH=$PKG_CONFIG_PATH - ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-user + ../configure --enable-werror $QEMU_CONFIGURE_OPTS $ACCEL_CONFIGURE_OPTS + --disable-user --target-list-exclude="arm-softmmu cris-softmmu i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu mips64-softmmu ppc-softmmu sh4-softmmu xtensa-softmmu" @@ -27,7 +28,7 @@ - PKG_CONFIG_PATH=$PKG_CONFIG_PATH ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-tools --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS - - make -j$(expr $(nproc) + 1) all check-build + - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS .cross_user_build_job: stage: build @@ -36,7 +37,8 @@ - mkdir build - cd build - PKG_CONFIG_PATH=$PKG_CONFIG_PATH - ../configure --enable-werror $QEMU_CONFIGURE_OPTS --disable-system + ../configure --enable-werror $QEMU_CONFIGURE_OPTS $ACCEL_CONFIGURE_OPTS + --disable-system - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS cross-armel-system: @@ -81,6 +83,15 @@ cross-i386-user: IMAGE: fedora-i386-cross MAKE_CHECK_ARGS: check +cross-i386-tci: + extends: .cross_accel_build_job + timeout: 60m + variables: + IMAGE: fedora-i386-cross + ACCEL: tcg-interpreter + ACCEL_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,aarch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user + MAKE_CHECK_ARGS: check + cross-mips-system: extends: .cross_system_build_job variables: diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker index a6e411291b..aa66314c65 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -5,6 +5,7 @@ ENV PACKAGES \ findutils \ gcc \ git \ + libffi-devel.i686 \ libtasn1-devel.i686 \ libzstd-devel.i686 \ make \