Re: [PATCH] tests: add missing genh dependency
On 9/11/20 3:42 PM, Paolo Bonzini wrote:
> Fix high-parallelism builds by forcing all generated headers
> to be created before tests are compiled.
FYI I had this problem too (simply building with -j8)
simply adding a new qapi/file.json.
Reviewed-by: Philippe Mathieu-Daudé
>
> Reported-by: Claudio Fontana
> Signed-off-by: Paolo Bonzini
> ---
> tests/meson.build | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/meson.build b/tests/meson.build
> index 3683512dca..e2b915ea8f 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -56,7 +56,7 @@ 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,
> test_qapi_outputs_extra])
> +libtestqapi = static_library('testqapi', sources: [test_qapi_files, genh,
> test_qapi_outputs_extra])
> testqapi = declare_dependency(link_with: libtestqapi)
>
> testblock = declare_dependency(dependencies: [block], sources: 'iothread.c')
> @@ -223,7 +223,7 @@ foreach test_name, extra: tests
> src += test_ss.all_sources()
> deps += test_ss.all_dependencies()
>endif
> - exe = executable(test_name, src, dependencies: deps)
> + exe = executable(test_name, src, genh, dependencies: deps)
>
>test(test_name, exe,
> depends: test_deps.get(test_name, []),
>
Re: [PATCH] tests: add missing genh dependency
On 9/11/20 3:42 PM, Paolo Bonzini wrote:
> Fix high-parallelism builds by forcing all generated headers
> to be created before tests are compiled.
>
> Reported-by: Claudio Fontana
> Signed-off-by: Paolo Bonzini
> ---
> tests/meson.build | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/meson.build b/tests/meson.build
> index 3683512dca..e2b915ea8f 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -56,7 +56,7 @@ 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,
> test_qapi_outputs_extra])
> +libtestqapi = static_library('testqapi', sources: [test_qapi_files, genh,
> test_qapi_outputs_extra])
> testqapi = declare_dependency(link_with: libtestqapi)
>
> testblock = declare_dependency(dependencies: [block], sources: 'iothread.c')
> @@ -223,7 +223,7 @@ foreach test_name, extra: tests
> src += test_ss.all_sources()
> deps += test_ss.all_dependencies()
>endif
> - exe = executable(test_name, src, dependencies: deps)
> + exe = executable(test_name, src, genh, dependencies: deps)
>
>test(test_name, exe,
> depends: test_deps.get(test_name, []),
>
Tested with 160 processors,
make -j120
Tested-by: Claudio Fontana
[PATCH] tests: add missing genh dependency
Fix high-parallelism builds by forcing all generated headers
to be created before tests are compiled.
Reported-by: Claudio Fontana
Signed-off-by: Paolo Bonzini
---
tests/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/meson.build b/tests/meson.build
index 3683512dca..e2b915ea8f 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -56,7 +56,7 @@ 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,
test_qapi_outputs_extra])
+libtestqapi = static_library('testqapi', sources: [test_qapi_files, genh,
test_qapi_outputs_extra])
testqapi = declare_dependency(link_with: libtestqapi)
testblock = declare_dependency(dependencies: [block], sources: 'iothread.c')
@@ -223,7 +223,7 @@ foreach test_name, extra: tests
src += test_ss.all_sources()
deps += test_ss.all_dependencies()
endif
- exe = executable(test_name, src, dependencies: deps)
+ exe = executable(test_name, src, genh, dependencies: deps)
test(test_name, exe,
depends: test_deps.get(test_name, []),
--
2.26.2
