diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-03-23 16:06:38 -0400 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.com> | 2021-03-23 18:07:18 -0400 |
commit | 37d4c86e5b570097b1600148fb872bce27d98f32 (patch) | |
tree | 91ae76b7741dde0445cf28e52db2cc7e593e9aae /test cases | |
parent | 66d62a224e92c41d6012dc6c23912a965da4da8f (diff) | |
download | meson-37d4c86e5b570097b1600148fb872bce27d98f32.zip meson-37d4c86e5b570097b1600148fb872bce27d98f32.tar.gz meson-37d4c86e5b570097b1600148fb872bce27d98f32.tar.bz2 |
interpreter: Fix spurious warning in include_directories()
When doing include_directories('.') at the root of the subproject we
should not warn about sandboxing violation.
Diffstat (limited to 'test cases')
3 files changed, 8 insertions, 2 deletions
diff --git a/test cases/common/240 includedir violation/meson.build b/test cases/common/240 includedir violation/meson.build index a82069e..0216be6 100644 --- a/test cases/common/240 includedir violation/meson.build +++ b/test cases/common/240 includedir violation/meson.build @@ -1,5 +1,9 @@ project('foo', 'c') +# It is fine to include the root source dir +include_directories('.') +subproject('sub') + # This is here rather than in failing because this needs a # transition period to avoid breaking existing projects. # Once this becomes an error, move this under failing tests. diff --git a/test cases/common/240 includedir violation/subprojects/sub/meson.build b/test cases/common/240 includedir violation/subprojects/sub/meson.build index 7211018..352f4a2 100644 --- a/test cases/common/240 includedir violation/subprojects/sub/meson.build +++ b/test cases/common/240 includedir violation/subprojects/sub/meson.build @@ -1,3 +1,3 @@ project('subproj', 'c') -# This is never actually executed, just here for completeness. +include_directories('.') diff --git a/test cases/common/240 includedir violation/test.json b/test cases/common/240 includedir violation/test.json index d6e56a3..fea19a1 100644 --- a/test cases/common/240 includedir violation/test.json +++ b/test cases/common/240 includedir violation/test.json @@ -1,7 +1,9 @@ { "stdout": [ { - "line": "WARNING: include_directories sandbox violation!" + "line": ".*WARNING: include_directories sandbox violation!", + "match": "re", + "count": 1 } ] } |