summaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-04-08 23:32:31 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-04-08 23:32:31 +0300
commitd532dbef4254638ea09706678160a009f3b26ab2 (patch)
tree2d5366963c2bd8ee6e42b125644b7b29377ca6fe /test cases
parente3b72045c42e11b372d468899e570be229b24fc4 (diff)
downloadmeson-d532dbef4254638ea09706678160a009f3b26ab2.tar.gz
Fix use of shared subprojects.
Diffstat (limited to 'test cases')
-rw-r--r--test cases/common/79 shared subproject/a.c13
-rw-r--r--test cases/common/79 shared subproject/meson.build3
-rw-r--r--test cases/common/79 shared subproject/subprojects/B/b.c12
-rw-r--r--test cases/common/79 shared subproject/subprojects/C/c.c6
4 files changed, 25 insertions, 9 deletions
diff --git a/test cases/common/79 shared subproject/a.c b/test cases/common/79 shared subproject/a.c
new file mode 100644
index 000000000..6ed96fa05
--- /dev/null
+++ b/test cases/common/79 shared subproject/a.c
@@ -0,0 +1,13 @@
+#include<assert.h>
+char func_b();
+char func_c();
+
+int main(int argc, char **argv) {
+ if(func_b() != 'b') {
+ return 1;
+ }
+ if(func_c() != 'c') {
+ return 2;
+ }
+ return 0;
+}
diff --git a/test cases/common/79 shared subproject/meson.build b/test cases/common/79 shared subproject/meson.build
index ee4c09f8a..92b1c8f90 100644
--- a/test cases/common/79 shared subproject/meson.build
+++ b/test cases/common/79 shared subproject/meson.build
@@ -6,4 +6,5 @@ b = B.get_variable('b')
C = subproject('C')
c = B.get_variable('c')
-a = executable('a', 'a.c', link_with : [ b, c ])
+a = executable('a', 'a.c', link_with : [b, c])
+test('a test', a)
diff --git a/test cases/common/79 shared subproject/subprojects/B/b.c b/test cases/common/79 shared subproject/subprojects/B/b.c
index 2ee5a428a..03b0cc72e 100644
--- a/test cases/common/79 shared subproject/subprojects/B/b.c
+++ b/test cases/common/79 shared subproject/subprojects/B/b.c
@@ -1,5 +1,9 @@
-char
-func_b()
-{
- return 'b';
+#include<stdlib.h>
+char func_c();
+
+char func_b() {
+ if(func_c() != 'c') {
+ exit(3);
+ }
+ return 'b';
}
diff --git a/test cases/common/79 shared subproject/subprojects/C/c.c b/test cases/common/79 shared subproject/subprojects/C/c.c
index ff4725101..3bbac08c9 100644
--- a/test cases/common/79 shared subproject/subprojects/C/c.c
+++ b/test cases/common/79 shared subproject/subprojects/C/c.c
@@ -1,5 +1,3 @@
-char
-func_c()
-{
- return 'c';
+char func_c() {
+ return 'c';
}