diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-03-28 14:29:56 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-03-28 14:47:55 +0530 |
| commit | 03d0feec7ceed1a1ee2e6284a86dbc26a088440f (patch) | |
| tree | 238060b031c642035c5dc5b6c433d565d0609ed1 | |
| parent | f4f9272e87a5e21cbc255f47234f31212b7a8338 (diff) | |
| download | meson-03d0feec7ceed1a1ee2e6284a86dbc26a088440f.zip meson-03d0feec7ceed1a1ee2e6284a86dbc26a088440f.tar.gz meson-03d0feec7ceed1a1ee2e6284a86dbc26a088440f.tar.bz2 | |
tests/windows/5: Add more subdirs to the test
This improves test coverage by testing that resources, includes, and
build targets being in separate directories works properly.
| -rw-r--r-- | test cases/windows/5 resources/inc/meson.build | 1 | ||||
| -rw-r--r-- | test cases/windows/5 resources/inc/resource/resource.h (renamed from test cases/windows/5 resources/inc/resource.h) | 0 | ||||
| -rw-r--r-- | test cases/windows/5 resources/meson.build | 6 | ||||
| -rw-r--r-- | test cases/windows/5 resources/res/meson.build | 4 | ||||
| -rw-r--r-- | test cases/windows/5 resources/res/myres.rc (renamed from test cases/windows/5 resources/myres.rc) | 0 | ||||
| -rw-r--r-- | test cases/windows/5 resources/res/sample.ico (renamed from test cases/windows/5 resources/sample.ico) | bin | 9662 -> 9662 bytes |
6 files changed, 7 insertions, 4 deletions
diff --git a/test cases/windows/5 resources/inc/meson.build b/test cases/windows/5 resources/inc/meson.build new file mode 100644 index 0000000..b8b511a --- /dev/null +++ b/test cases/windows/5 resources/inc/meson.build @@ -0,0 +1 @@ +inc = include_directories('resource') diff --git a/test cases/windows/5 resources/inc/resource.h b/test cases/windows/5 resources/inc/resource/resource.h index dbdd509..dbdd509 100644 --- a/test cases/windows/5 resources/inc/resource.h +++ b/test cases/windows/5 resources/inc/resource/resource.h diff --git a/test cases/windows/5 resources/meson.build b/test cases/windows/5 resources/meson.build index 3c13634..30bfbbf 100644 --- a/test cases/windows/5 resources/meson.build +++ b/test cases/windows/5 resources/meson.build @@ -1,9 +1,7 @@ project('winmain', 'c') -win = import('windows') -res = win.compile_resources('myres.rc', - include_directories : include_directories('inc') -) +subdir('inc') +subdir('res') exe = executable('prog', 'prog.c', res, diff --git a/test cases/windows/5 resources/res/meson.build b/test cases/windows/5 resources/res/meson.build new file mode 100644 index 0000000..184854e --- /dev/null +++ b/test cases/windows/5 resources/res/meson.build @@ -0,0 +1,4 @@ +win = import('windows') + +res = win.compile_resources('myres.rc', + include_directories : inc) diff --git a/test cases/windows/5 resources/myres.rc b/test cases/windows/5 resources/res/myres.rc index 802bc7b..802bc7b 100644 --- a/test cases/windows/5 resources/myres.rc +++ b/test cases/windows/5 resources/res/myres.rc diff --git a/test cases/windows/5 resources/sample.ico b/test cases/windows/5 resources/res/sample.ico Binary files differindex 24bd3d9..24bd3d9 100644 --- a/test cases/windows/5 resources/sample.ico +++ b/test cases/windows/5 resources/res/sample.ico |