diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-03-14 12:07:23 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2022-03-14 10:27:38 -0700 |
| commit | 9d42e58ea2d673a63a9918f138b81d1bd6057e73 (patch) | |
| tree | cf3855c10c3f5e063741855af43d266aab66bac1 /test cases/common | |
| parent | 076855c22ffdae28cc86816c9fd06b9c0e401702 (diff) | |
| download | meson-9d42e58ea2d673a63a9918f138b81d1bd6057e73.tar.gz | |
sourceset: reinstate extra_deps
Dependencies in the "if_true" keyword argument do not prevent the
sources from being used; in other words, they work just like dependencies
with "disabler: false".
However, this was broken in commit ab0ffc6a2 ("modules/sourceset: Fix
remaining typing issues", 2022-02-23) which changed logic instead of
just fixing typing issues. This was likely an attempt to avoid using
"dependencies.Dependency" after the "dependencies" field was declared,
but it also broke QEMU.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'test cases/common')
| -rw-r--r-- | test cases/common/212 source set configuration_data/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test cases/common/212 source set configuration_data/meson.build b/test cases/common/212 source set configuration_data/meson.build index 104f39d21..9aacbc4b2 100644 --- a/test cases/common/212 source set configuration_data/meson.build +++ b/test cases/common/212 source set configuration_data/meson.build @@ -8,7 +8,7 @@ source_set = import('sourceset') sources = source_set.source_set() sources.add(when: 'YES', if_false: ['nope.c']) -sources.add(when: 'YES1', if_true: files('a.c')) +sources.add(when: 'YES1', if_true: [files('a.c'), not_found]) subdir('subdir') sources.add(when: 'NO', if_true: 'nope.c', if_false: ['f.c']) sources.add(when: 'NO', if_true: bad, if_false: ['f.c']) @@ -24,7 +24,7 @@ sources2.add(when: 'YES1', if_true: 'nope.c') sources.add_all(when: 'NO', if_true: sources2) # test duplicate items -sources.add(when: 'YES1', if_true: files('a.c')) +sources.add(when: 'YES1', if_true: [files('a.c'), not_found]) conf1 = configuration_data() conf1.set10('YES', true) |