aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test cases/common/162 wrap file should not failed/meson.build4
-rw-r--r--test cases/common/162 wrap file should not failed/src/meson.build2
-rw-r--r--test cases/common/162 wrap file should not failed/src/subprojects/foo/prog2.c7
-rw-r--r--test cases/common/162 wrap file should not failed/src/subprojects/prog.c7
-rw-r--r--test cases/common/162 wrap file should not failed/subprojects/zlib-1.2.8/foo.c3
-rw-r--r--test cases/failing/63 subproj filegrab/meson.build2
-rw-r--r--test cases/failing/64 grab subproj/meson.build7
-rw-r--r--test cases/failing/64 grab subproj/subprojects/foo/meson.build3
-rw-r--r--test cases/failing/64 grab subproj/subprojects/foo/sub.c6
-rw-r--r--test cases/failing/65 grab sibling/meson.build3
-rw-r--r--test cases/failing/65 grab sibling/subprojects/a/meson.build3
-rw-r--r--test cases/failing/65 grab sibling/subprojects/b/meson.build3
-rw-r--r--test cases/failing/65 grab sibling/subprojects/b/sneaky.c6
13 files changed, 56 insertions, 0 deletions
diff --git a/test cases/common/162 wrap file should not failed/meson.build b/test cases/common/162 wrap file should not failed/meson.build
index 64d8d1f..9cf4e9a 100644
--- a/test cases/common/162 wrap file should not failed/meson.build
+++ b/test cases/common/162 wrap file should not failed/meson.build
@@ -1,3 +1,7 @@
project('mainproj', 'c')
subproject('zlib')
+
+executable('grabprog', files('src/subprojects/prog.c'))
+executable('grabprog2', files('src/subprojects/foo/prog2.c'))
+subdir('src')
diff --git a/test cases/common/162 wrap file should not failed/src/meson.build b/test cases/common/162 wrap file should not failed/src/meson.build
new file mode 100644
index 0000000..69f666d
--- /dev/null
+++ b/test cases/common/162 wrap file should not failed/src/meson.build
@@ -0,0 +1,2 @@
+executable('grabprog3', files('subprojects/prog.c'))
+executable('grabprog4', files('subprojects/foo/prog2.c'))
diff --git a/test cases/common/162 wrap file should not failed/src/subprojects/foo/prog2.c b/test cases/common/162 wrap file should not failed/src/subprojects/foo/prog2.c
new file mode 100644
index 0000000..56f61a8
--- /dev/null
+++ b/test cases/common/162 wrap file should not failed/src/subprojects/foo/prog2.c
@@ -0,0 +1,7 @@
+#include<stdio.h>
+
+int main(int argc, char **argv) {
+ printf("Do not have a file layout like this in your own projects.\n");
+ printf("This is only to test that this works.\n");
+ return 0;
+}
diff --git a/test cases/common/162 wrap file should not failed/src/subprojects/prog.c b/test cases/common/162 wrap file should not failed/src/subprojects/prog.c
new file mode 100644
index 0000000..56f61a8
--- /dev/null
+++ b/test cases/common/162 wrap file should not failed/src/subprojects/prog.c
@@ -0,0 +1,7 @@
+#include<stdio.h>
+
+int main(int argc, char **argv) {
+ printf("Do not have a file layout like this in your own projects.\n");
+ printf("This is only to test that this works.\n");
+ return 0;
+}
diff --git a/test cases/common/162 wrap file should not failed/subprojects/zlib-1.2.8/foo.c b/test cases/common/162 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
index e69de29..019f2ba 100644
--- a/test cases/common/162 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
+++ b/test cases/common/162 wrap file should not failed/subprojects/zlib-1.2.8/foo.c
@@ -0,0 +1,3 @@
+int dummy_func() {
+ return 42;
+}
diff --git a/test cases/failing/63 subproj filegrab/meson.build b/test cases/failing/63 subproj filegrab/meson.build
index 6982c78..f38d6c7 100644
--- a/test cases/failing/63 subproj filegrab/meson.build
+++ b/test cases/failing/63 subproj filegrab/meson.build
@@ -1,3 +1,5 @@
project('mainproj', 'c')
+# Try to grab a file from a parent project.
+
subproject('a')
diff --git a/test cases/failing/64 grab subproj/meson.build b/test cases/failing/64 grab subproj/meson.build
new file mode 100644
index 0000000..30fc690
--- /dev/null
+++ b/test cases/failing/64 grab subproj/meson.build
@@ -0,0 +1,7 @@
+project('grabber', 'c')
+
+# Try to grab a file from a child subproject.
+
+subproject('foo')
+
+executable('foo', 'subprojects/foo/sub.c')
diff --git a/test cases/failing/64 grab subproj/subprojects/foo/meson.build b/test cases/failing/64 grab subproj/subprojects/foo/meson.build
new file mode 100644
index 0000000..b346f6d
--- /dev/null
+++ b/test cases/failing/64 grab subproj/subprojects/foo/meson.build
@@ -0,0 +1,3 @@
+project('foo', 'c')
+
+message('I do nothing.')
diff --git a/test cases/failing/64 grab subproj/subprojects/foo/sub.c b/test cases/failing/64 grab subproj/subprojects/foo/sub.c
new file mode 100644
index 0000000..a94b1f5
--- /dev/null
+++ b/test cases/failing/64 grab subproj/subprojects/foo/sub.c
@@ -0,0 +1,6 @@
+#include<stdio.h>
+
+int main(int argc, char **argv) {
+ printf("I am a subproject executable file.\n");
+ return 0;
+}
diff --git a/test cases/failing/65 grab sibling/meson.build b/test cases/failing/65 grab sibling/meson.build
new file mode 100644
index 0000000..60b926a
--- /dev/null
+++ b/test cases/failing/65 grab sibling/meson.build
@@ -0,0 +1,3 @@
+project('master', 'c')
+
+subproject('a')
diff --git a/test cases/failing/65 grab sibling/subprojects/a/meson.build b/test cases/failing/65 grab sibling/subprojects/a/meson.build
new file mode 100644
index 0000000..6dd9f61
--- /dev/null
+++ b/test cases/failing/65 grab sibling/subprojects/a/meson.build
@@ -0,0 +1,3 @@
+project('a', 'c')
+
+executable('sneaky', '../b/sneaky.c')
diff --git a/test cases/failing/65 grab sibling/subprojects/b/meson.build b/test cases/failing/65 grab sibling/subprojects/b/meson.build
new file mode 100644
index 0000000..7c70fe5
--- /dev/null
+++ b/test cases/failing/65 grab sibling/subprojects/b/meson.build
@@ -0,0 +1,3 @@
+projecT('b', 'c')
+
+message('I do nothing.')
diff --git a/test cases/failing/65 grab sibling/subprojects/b/sneaky.c b/test cases/failing/65 grab sibling/subprojects/b/sneaky.c
new file mode 100644
index 0000000..f1cb916
--- /dev/null
+++ b/test cases/failing/65 grab sibling/subprojects/b/sneaky.c
@@ -0,0 +1,6 @@
+#include<stdio.h>
+
+int main(int argc, char **argv) {
+ printf("I can only come into existance via trickery.\n");
+ return 0;
+}