From 4952d2628e4e9fa8c512678b585821f09d0baba6 Mon Sep 17 00:00:00 2001 From: Hemmo Nieminen Date: Thu, 9 Apr 2015 00:09:24 +0300 Subject: [PATCH] Add a second "shared subproject" test. This time, process the subprojects in reverse order. Signed-off-by: Hemmo Nieminen --- test cases/common/80 shared subproject 2/a.c | 13 +++++++++++++ .../common/80 shared subproject 2/meson.build | 10 ++++++++++ .../common/80 shared subproject 2/subprojects/B/b.c | 9 +++++++++ .../subprojects/B/meson.build | 4 ++++ .../common/80 shared subproject 2/subprojects/C/c.c | 3 +++ .../subprojects/C/meson.build | 2 ++ 6 files changed, 41 insertions(+) create mode 100644 test cases/common/80 shared subproject 2/a.c create mode 100644 test cases/common/80 shared subproject 2/meson.build create mode 100644 test cases/common/80 shared subproject 2/subprojects/B/b.c create mode 100644 test cases/common/80 shared subproject 2/subprojects/B/meson.build create mode 100644 test cases/common/80 shared subproject 2/subprojects/C/c.c create mode 100644 test cases/common/80 shared subproject 2/subprojects/C/meson.build diff --git a/test cases/common/80 shared subproject 2/a.c b/test cases/common/80 shared subproject 2/a.c new file mode 100644 index 000000000..6ed96fa05 --- /dev/null +++ b/test cases/common/80 shared subproject 2/a.c @@ -0,0 +1,13 @@ +#include +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/80 shared subproject 2/meson.build b/test cases/common/80 shared subproject 2/meson.build new file mode 100644 index 000000000..a0ce0f45a --- /dev/null +++ b/test cases/common/80 shared subproject 2/meson.build @@ -0,0 +1,10 @@ +project('A', 'c') + +C = subproject('C') +c = C.get_variable('c') + +B = subproject('B') +b = B.get_variable('b') + +a = executable('a', 'a.c', link_with : [b, c]) +test('a test', a) diff --git a/test cases/common/80 shared subproject 2/subprojects/B/b.c b/test cases/common/80 shared subproject 2/subprojects/B/b.c new file mode 100644 index 000000000..03b0cc72e --- /dev/null +++ b/test cases/common/80 shared subproject 2/subprojects/B/b.c @@ -0,0 +1,9 @@ +#include +char func_c(); + +char func_b() { + if(func_c() != 'c') { + exit(3); + } + return 'b'; +} diff --git a/test cases/common/80 shared subproject 2/subprojects/B/meson.build b/test cases/common/80 shared subproject 2/subprojects/B/meson.build new file mode 100644 index 000000000..280c60ce2 --- /dev/null +++ b/test cases/common/80 shared subproject 2/subprojects/B/meson.build @@ -0,0 +1,4 @@ +project('B', 'c') +C = subproject('C') +c = C.get_variable('c') +b = shared_library('b', 'b.c', link_with : c) diff --git a/test cases/common/80 shared subproject 2/subprojects/C/c.c b/test cases/common/80 shared subproject 2/subprojects/C/c.c new file mode 100644 index 000000000..3bbac08c9 --- /dev/null +++ b/test cases/common/80 shared subproject 2/subprojects/C/c.c @@ -0,0 +1,3 @@ +char func_c() { + return 'c'; +} diff --git a/test cases/common/80 shared subproject 2/subprojects/C/meson.build b/test cases/common/80 shared subproject 2/subprojects/C/meson.build new file mode 100644 index 000000000..abf0b1e26 --- /dev/null +++ b/test cases/common/80 shared subproject 2/subprojects/C/meson.build @@ -0,0 +1,2 @@ +project('C', 'c') +c = shared_library('c', 'c.c')