[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/22] tests: add missing generated sources to testqapi
From: |
Paolo Bonzini |
Subject: |
[PULL 05/22] tests: add missing generated sources to testqapi |
Date: |
Fri, 16 Oct 2020 07:47:57 -0400 |
Ninja notices them due to a different order in visiting the graph.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/include/meson.build | 8 ++++----
tests/meson.build | 14 ++++++++++++--
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/tests/include/meson.build b/tests/include/meson.build
index fea3a6342f..9abba308fa 100644
--- a/tests/include/meson.build
+++ b/tests/include/meson.build
@@ -10,7 +10,7 @@ test_qapi_outputs_extra = [
'test-qapi-visit-sub-module.h',
]
-test_qapi_outputs_extra = custom_target('QAPI test (include)',
- output: test_qapi_outputs_extra,
- input: test_qapi_files,
- command: 'true')
+test_qapi_files_extra = custom_target('QAPI test (include)',
+ output: test_qapi_outputs_extra,
+ input: test_qapi_files,
+ command: 'true')
diff --git a/tests/meson.build b/tests/meson.build
index bf47a38c74..afeb6be689 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -56,8 +56,18 @@ test_qapi_files = custom_target('Test QAPI files',
# perhaps change qapi_gen to replace / with _, like Meson itself does?
subdir('include')
-libtestqapi = static_library('testqapi', sources: [test_qapi_files, genh,
test_qapi_outputs_extra])
-testqapi = declare_dependency(link_with: libtestqapi)
+test_qapi_sources = []
+test_qapi_headers = []
+i = 0
+foreach o: test_qapi_files.to_list() + test_qapi_files_extra.to_list()
+ if o.full_path().endswith('.h')
+ test_qapi_headers += o
+ endif
+ test_qapi_sources += o
+endforeach
+
+libtestqapi = static_library('testqapi', sources: [genh, test_qapi_sources])
+testqapi = declare_dependency(link_with: libtestqapi, sources: [genh,
test_qapi_headers])
testblock = declare_dependency(dependencies: [block], sources: 'iothread.c')
--
2.26.2
- [PULL 00/22] Build system + misc changes for 2020-10-16, Paolo Bonzini, 2020/10/16
- [PULL 01/22] submodules: bump meson to 0.55.3, Paolo Bonzini, 2020/10/16
- [PULL 02/22] Makefile: Ensure cscope.out/tags/TAGS are generated in the source tree, Paolo Bonzini, 2020/10/16
- [PULL 03/22] tests/Makefile.include: unbreak non-tcg builds, Paolo Bonzini, 2020/10/16
- [PULL 06/22] configure: move QEMU_INCLUDES to meson, Paolo Bonzini, 2020/10/16
- [PULL 05/22] tests: add missing generated sources to testqapi,
Paolo Bonzini <=
- [PULL 08/22] add ninja to dockerfiles, CI configurations and test VMs, Paolo Bonzini, 2020/10/16
- [PULL 11/22] build: add --enable/--disable-libudev, Paolo Bonzini, 2020/10/16
- [PULL 04/22] make: run shell with pipefail, Paolo Bonzini, 2020/10/16
- [PULL 14/22] configure: fix handling of --docdir parameter, Paolo Bonzini, 2020/10/16
- [PULL 07/22] dockerfiles: enable Centos 8 PowerTools, Paolo Bonzini, 2020/10/16
- [PULL 13/22] meson: cleanup curses/iconv test, Paolo Bonzini, 2020/10/16
- [PULL 12/22] meson.build: don't condition iconv detection on library detection, Paolo Bonzini, 2020/10/16
- [PULL 09/22] build: cleanups to Makefile, Paolo Bonzini, 2020/10/16
- [PULL 15/22] meson: Only install icons and qemu.desktop if have_system, Paolo Bonzini, 2020/10/16
- [PULL 16/22] docs: Fix Sphinx configuration for msys2/mingw, Paolo Bonzini, 2020/10/16