diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-03-24 17:53:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 17:53:10 +0200 |
| commit | 9b27d110d1e9dac576e459f222bcfa87027d2d99 (patch) | |
| tree | 0a8ed554bd4a5cd547184069fe20055e57913dec /test cases | |
| parent | 01c6b50a77357ba19c1023eb40f54263b5b91ee8 (diff) | |
| parent | 37d4c86e5b570097b1600148fb872bce27d98f32 (diff) | |
| download | meson-9b27d110d1e9dac576e459f222bcfa87027d2d99.zip meson-9b27d110d1e9dac576e459f222bcfa87027d2d99.tar.gz meson-9b27d110d1e9dac576e459f222bcfa87027d2d99.tar.bz2 | |
Merge pull request #8571 from xclaesse/spurious-warning
Fix spurious sandbox violation warning
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 } ] } |