From 1badb709cffee455ec9fb2253cf7aec66e09a9d2 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 18 Sep 2020 04:57:25 -0400 Subject: configure: convert accelerator variables to meson options Prepare for moving the tests to meson. For now they only have enabled/disabled as the possible values when meson is invoked, but "auto" will be a possibility later, when configure will only parse the command line options. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- tests/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/meson.build b/tests/meson.build index 3c29690..bf47a38 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 -- cgit v1.1 From 8c17b8403c9732347013b413bfb9299e99bff350 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 3 Oct 2020 03:00:46 -0400 Subject: tests: tcg: do not use implicit rules Use pattern rules to clarify which targets are going to match the rule and to provide clearer error messages. Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.include b/tests/Makefile.include index 40d909b..5aca98e 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, \ -- cgit v1.1 From d72d6dcb0d633bb08c2dc5a959a47608a1655018 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 3 Oct 2020 10:50:54 +0200 Subject: dockerfiles: add diffutils to Fedora MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some reason diffutils is not included in the Fedora containers anymore, causing the build to fail. Signed-off-by: Paolo Bonzini Reviewed-by: Neal Gompa Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20201003085054.332992-2-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- tests/docker/dockerfiles/fedora.docker | 1 + 1 file changed, 1 insertion(+) (limited to 'tests') diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 71e4b56..ec78341 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++ \ -- cgit v1.1