From 7b6e527f440cd7e6f8be2b07cee320ee6ca18786 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 29 Apr 2024 06:41:38 +0200 Subject: Adding upstream version 1.0.1. Signed-off-by: Daniel Baumann --- test cases/warning/5 fallback consistency/meson.build | 4 ++++ test cases/warning/5 fallback consistency/subprojects/foo.wrap | 6 ++++++ .../warning/5 fallback consistency/subprojects/foo/meson.build | 6 ++++++ test cases/warning/5 fallback consistency/test.json | 10 ++++++++++ 4 files changed, 26 insertions(+) create mode 100644 test cases/warning/5 fallback consistency/meson.build create mode 100644 test cases/warning/5 fallback consistency/subprojects/foo.wrap create mode 100644 test cases/warning/5 fallback consistency/subprojects/foo/meson.build create mode 100644 test cases/warning/5 fallback consistency/test.json (limited to 'test cases/warning/5 fallback consistency') diff --git a/test cases/warning/5 fallback consistency/meson.build b/test cases/warning/5 fallback consistency/meson.build new file mode 100644 index 0000000..3af6ce8 --- /dev/null +++ b/test cases/warning/5 fallback consistency/meson.build @@ -0,0 +1,4 @@ +project('fallback consistency') + +# Subproject overrides foo with foo_dep but wrap file says it's bar_dep. This should warn. +dependency('foo') diff --git a/test cases/warning/5 fallback consistency/subprojects/foo.wrap b/test cases/warning/5 fallback consistency/subprojects/foo.wrap new file mode 100644 index 0000000..28055d9 --- /dev/null +++ b/test cases/warning/5 fallback consistency/subprojects/foo.wrap @@ -0,0 +1,6 @@ +[wrap-file] +source_url = http://host.invalid/foo.tar.gz +source_filename = foo.tar.gz + +[provide] +foo = bar_dep diff --git a/test cases/warning/5 fallback consistency/subprojects/foo/meson.build b/test cases/warning/5 fallback consistency/subprojects/foo/meson.build new file mode 100644 index 0000000..fb58a4a --- /dev/null +++ b/test cases/warning/5 fallback consistency/subprojects/foo/meson.build @@ -0,0 +1,6 @@ +project('sub') + +foo_dep = declare_dependency() +meson.override_dependency('foo', foo_dep) + +bar_dep = declare_dependency() diff --git a/test cases/warning/5 fallback consistency/test.json b/test cases/warning/5 fallback consistency/test.json new file mode 100644 index 0000000..8ab28d1 --- /dev/null +++ b/test cases/warning/5 fallback consistency/test.json @@ -0,0 +1,10 @@ +{ + "stdout": [ + { + "line": "WARNING: Inconsistency: Subproject has overridden the dependency with another variable than 'bar_dep'" + } + ], + "tools": { + "cmake": ">=3.14" + } +} -- cgit v1.2.3