aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
Diffstat (limited to 'test cases')
-rw-r--r--test cases/common/240 includedir violation/meson.build4
-rw-r--r--test cases/common/240 includedir violation/subprojects/sub/meson.build2
-rw-r--r--test cases/common/240 includedir violation/test.json4
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
}
]
}