diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-20 13:58:20 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-20 13:58:20 +0300 |
| commit | c7e7d1a4c354b21fe9308dd872a99ec4bc7356be (patch) | |
| tree | 894ff3c672fdf0389d44951a75fd0e58986ce43a /test cases | |
| parent | c21637a01db7f6958c816bfe2a8b0383b96e8f68 (diff) | |
| download | meson-c7e7d1a4c354b21fe9308dd872a99ec4bc7356be.zip meson-c7e7d1a4c354b21fe9308dd872a99ec4bc7356be.tar.gz meson-c7e7d1a4c354b21fe9308dd872a99ec4bc7356be.tar.bz2 | |
Can execute found programs with run_command.
Diffstat (limited to 'test cases')
6 files changed, 22 insertions, 0 deletions
diff --git a/test cases/common/55 file grabber/meson.build b/test cases/common/55 file grabber/meson.build index c0c11b9..88e5861 100644 --- a/test cases/common/55 file grabber/meson.build +++ b/test cases/common/55 file grabber/meson.build @@ -11,10 +11,14 @@ project('grabber', 'c') if build.name() == 'windows' c = run_command('grabber.bat') + grabber = find_program('grabber') else c = run_command('grabber.sh') + grabber = find_program('grabber.sh') endif + +# First test running command explicitly. if c.returncode() != 0 error('Executing script failed.') endif @@ -26,3 +30,6 @@ sources = c.stdout().strip().split(newline) e = executable('prog', sources) test('grabtest', e) + +# Then test using program with find_program +subdir('subdir') diff --git a/test cases/common/55 file grabber/subdir/meson.build b/test cases/common/55 file grabber/subdir/meson.build new file mode 100644 index 0000000..230d6f7 --- /dev/null +++ b/test cases/common/55 file grabber/subdir/meson.build @@ -0,0 +1,5 @@ +sc = run_command(grabber) +subsources = sc.stdout().strip().split(newline) + +se = executable('subprog', subsources) +test('subgrabtest', se) diff --git a/test cases/common/55 file grabber/subdir/suba.c b/test cases/common/55 file grabber/subdir/suba.c new file mode 100644 index 0000000..bee8ad7 --- /dev/null +++ b/test cases/common/55 file grabber/subdir/suba.c @@ -0,0 +1 @@ +int funca() { return 0; } diff --git a/test cases/common/55 file grabber/subdir/subb.c b/test cases/common/55 file grabber/subdir/subb.c new file mode 100644 index 0000000..0fdd162 --- /dev/null +++ b/test cases/common/55 file grabber/subdir/subb.c @@ -0,0 +1 @@ +int funcb() { return 0; } diff --git a/test cases/common/55 file grabber/subdir/subc.c b/test cases/common/55 file grabber/subdir/subc.c new file mode 100644 index 0000000..63f951c --- /dev/null +++ b/test cases/common/55 file grabber/subdir/subc.c @@ -0,0 +1 @@ +int funcc() { return 0; } diff --git a/test cases/common/55 file grabber/subdir/subprog.c b/test cases/common/55 file grabber/subdir/subprog.c new file mode 100644 index 0000000..3524f60 --- /dev/null +++ b/test cases/common/55 file grabber/subdir/subprog.c @@ -0,0 +1,7 @@ +int funca(); +int funcb(); +int funcc(); + +int main(int argc, char **argv) { + return funca() + funcb() + funcc(); +} |