diff options
| author | Peter Maydell | 2020-10-05 14:12:55 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-10-05 14:12:55 +0200 |
| commit | 0ac0b47c44b4be6cbce26777a1a5968cc8f025a5 (patch) | |
| tree | 02d95d3ad0efc145b0b84da900b09f62b017a184 /tests | |
| parent | Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-cap-20201003' into... (diff) | |
| parent | dockerfiles: add diffutils to Fedora (diff) | |
| download | qemu-0ac0b47c44b4be6cbce26777a1a5968cc8f025a5.tar.gz qemu-0ac0b47c44b4be6cbce26777a1a5968cc8f025a5.tar.xz qemu-0ac0b47c44b4be6cbce26777a1a5968cc8f025a5.zip | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
* move target configuration to default-configs/targets (myself)
* Memory failure event (Zhenwei)
# gpg: Signature made Mon 05 Oct 2020 08:14:29 BST
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini-gitlab/tags/for-upstream:
dockerfiles: add diffutils to Fedora
tests: tcg: do not use implicit rules
target-i386: post memory failure event to QMP
qapi/run-state.json: introduce memory failure event
target-i386: seperate MCIP & MCE_MASK error reason
meson: move sparse detection to Meson and rewrite check_sparse.py
default-configs: remove redundant keys
default-configs: use TARGET_ARCH key
configure: move OpenBSD W^X test to meson
default-configs: remove default-configs/devices for user-mode targets
configure: remove target configuration
configure: remove useless config-target.mak symbols
configure: compute derivatives of target name in meson
configure: remove dead variable
configure: move accelerator logic to meson
configure: rewrite accelerator defaults as tests
configure: convert accelerator variables to meson options
default-configs: move files to default-configs/devices/
travis: remove TCI test
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
# configure
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.include | 6 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/fedora.docker | 1 | ||||
| -rw-r--r-- | tests/meson.build | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index 40d909badc..5aca98e60c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -50,21 +50,21 @@ RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) $(foreach PROBE_TARGET,$(TARGET_DIRS), \ $(eval -include $(SRC_PATH)/tests/tcg/Makefile.prereqs)) -build-tcg-tests-%: $(if $(CONFIG_PLUGIN),test-plugins) +$(BUILD_TCG_TARGET_RULES): build-tcg-tests-%: $(if $(CONFIG_PLUGIN),test-plugins) $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ SRC_PATH=$(SRC_PATH) \ V="$(V)" TARGET="$*" guest-tests, \ "BUILD", "TCG tests for $*") -run-tcg-tests-%: build-tcg-tests-% all +$(RUN_TCG_TARGET_RULES): run-tcg-tests-%: build-tcg-tests-% all $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ SRC_PATH=$(SRC_PATH) SPEED="$(SPEED)" \ V="$(V)" TARGET="$*" run-guest-tests, \ "RUN", "TCG tests for $*") -clean-tcg-tests-%: +$(CLEAN_TCG_TARGET_RULES): clean-tcg-tests-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ SRC_PATH=$(SRC_PATH) TARGET="$*" clean-guest-tests, \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 71e4b56977..ec783418c8 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -11,6 +11,7 @@ ENV PACKAGES \ cyrus-sasl-devel \ dbus-daemon \ device-mapper-multipath-devel \ + diffutils \ findutils \ gcc \ gcc-c++ \ diff --git a/tests/meson.build b/tests/meson.build index 3c2969092d..bf47a38c74 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -269,7 +269,7 @@ test('decodetree', sh, subdir('fp') -if 'CONFIG_TCG' in config_host +if not get_option('tcg').disabled() if 'CONFIG_PLUGIN' in config_host subdir('plugin') endif |