Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2…
…020-09-03' into staging * Cirrus-CI improvements and fixes (compile with -Werror & fix for 1h problem) * Two build system fixes to fix some failures the CI * One m68k QOMification patch * Some trivial qtest patches * Some small improvements for the Gitlab CI # gpg: Signature made Thu 03 Sep 2020 12:04:32 BST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/huth-gitlab/tags/pull-request-2020-09-03: gitlab-ci.yml: Set artifacts expiration time gitlab-ci.yml: Run check-qtest and check-unit at the end of the fuzzer job gitlab/travis: Rework the disabled features tests libqtest: Rename qmp_assert_error_class() to qmp_expect_error_and_unref() tests/qtest/ipmi-kcs: Fix assert side-effect tests/qtest/tpm: Declare input buffers const and static tests/qtest/ahci: Improve error handling (NEGATIVE_RETURNS) hw/m68k: QOMify the mcf5206 system integration module configure: Add system = 'linux' for meson when cross-compiling meson: fix keymaps without qemu-keymap cirrus.yml: Split FreeBSD job into two parts cirrus.yml: Update the macOS jobs to Catalina cirrus.yml: Compile macOS with -Werror cirrus.yml: Compile FreeBSD with -Werror configure: Fix atomic64 test for --enable-werror on macOS Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
- Loading branch information
Showing
18 changed files
with
183 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,42 +1,65 @@ | ||
env: | ||
CIRRUS_CLONE_DEPTH: 1 | ||
|
||
freebsd_12_task: | ||
freebsd_1st_task: | ||
freebsd_instance: | ||
image_family: freebsd-12-1 | ||
cpu: 8 | ||
memory: 8G | ||
cpu: 4 | ||
memory: 4G | ||
install_script: ASSUME_ALWAYS_YES=yes pkg bootstrap -f ; pkg install -y | ||
bash curl cyrus-sasl git glib gmake gnutls gsed | ||
nettle perl5 pixman pkgconf png usbredir | ||
script: | ||
- mkdir build | ||
- cd build | ||
- ../configure || { cat config.log; exit 1; } | ||
- gmake -j8 | ||
- gmake V=1 check | ||
- ../configure --disable-user --target-list-exclude='alpha-softmmu | ||
ppc64-softmmu ppc-softmmu riscv32-softmmu riscv64-softmmu s390x-softmmu | ||
sparc64-softmmu sparc-softmmu x86_64-softmmu i386-softmmu' | ||
--enable-werror || { cat config.log; exit 1; } | ||
- gmake -j$(sysctl -n hw.ncpu) | ||
- gmake -j$(sysctl -n hw.ncpu) check | ||
|
||
freebsd_2nd_task: | ||
freebsd_instance: | ||
image_family: freebsd-12-1 | ||
cpu: 4 | ||
memory: 4G | ||
install_script: ASSUME_ALWAYS_YES=yes pkg bootstrap -f ; pkg install -y | ||
bash curl cyrus-sasl git glib gmake gnutls gtk3 gsed libepoxy mesa-libs | ||
nettle perl5 pixman pkgconf png SDL2 usbredir | ||
script: | ||
- ./configure --enable-werror --target-list='alpha-softmmu ppc64-softmmu | ||
ppc-softmmu riscv32-softmmu riscv64-softmmu s390x-softmmu | ||
sparc64-softmmu sparc-softmmu x86_64-softmmu i386-softmmu | ||
sparc-bsd-user sparc64-bsd-user x86_64-bsd-user i386-bsd-user' | ||
|| { cat config.log; exit 1; } | ||
- gmake -j$(sysctl -n hw.ncpu) | ||
- gmake -j$(sysctl -n hw.ncpu) check | ||
|
||
macos_task: | ||
osx_instance: | ||
image: mojave-base | ||
image: catalina-base | ||
install_script: | ||
- brew install pkg-config python gnu-sed glib pixman make sdl2 bash | ||
script: | ||
- mkdir build | ||
- cd build | ||
- ../configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; } | ||
- ../configure --python=/usr/local/bin/python3 --enable-werror | ||
--extra-cflags='-Wno-error=deprecated-declarations' | ||
|| { cat config.log; exit 1; } | ||
- gmake -j$(sysctl -n hw.ncpu) | ||
- gmake check | ||
|
||
macos_xcode_task: | ||
osx_instance: | ||
# this is an alias for the latest Xcode | ||
image: mojave-xcode | ||
image: catalina-xcode | ||
install_script: | ||
- brew install pkg-config gnu-sed glib pixman make sdl2 bash | ||
script: | ||
- mkdir build | ||
- cd build | ||
- ../configure --cc=clang || { cat config.log; exit 1; } | ||
- ../configure --extra-cflags='-Wno-error=deprecated-declarations' | ||
--enable-werror --cc=clang || { cat config.log; exit 1; } | ||
- gmake -j$(sysctl -n hw.ncpu) | ||
- gmake check |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.