diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-03-23 08:28:23 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-03-23 08:28:23 +0530 |
| commit | 8482286236f6d91dfaa02e4254e0e15430e67eb2 (patch) | |
| tree | 92cf21690fb477b5e39e95e7462b935218761042 | |
| parent | dd828e3fd70602ed3298c9daf05c673348b7ffef (diff) | |
| download | meson-8482286236f6d91dfaa02e4254e0e15430e67eb2.zip meson-8482286236f6d91dfaa02e4254e0e15430e67eb2.tar.gz meson-8482286236f6d91dfaa02e4254e0e15430e67eb2.tar.bz2 | |
Test whether internal-dep include order is preserved
https://github.com/mesonbuild/meson/issues/1495
| -rw-r--r-- | test cases/common/138 include order/meson.build | 8 | ||||
| -rw-r--r-- | test cases/common/138 include order/sub2/meson.build | 1 | ||||
| -rw-r--r-- | test cases/common/138 include order/sub4/meson.build | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/test cases/common/138 include order/meson.build b/test cases/common/138 include order/meson.build index f744ae7..c79cb0a 100644 --- a/test cases/common/138 include order/meson.build +++ b/test cases/common/138 include order/meson.build @@ -19,4 +19,12 @@ subdir('sub3') # The directory where the target resides subdir('sub4') +# Test that the order in which internal dependencies are specified is +# preserved. This is needed especially when subprojects get involved and +# multiple build-root config.h files exist, and we must be sure that the +# correct one is found: https://github.com/mesonbuild/meson/issues/1495 +f = executable('somefxe', 'sub4/main.c', + dependencies : [correctinc, dep, wronginc]) + test('eh', e) +test('oh', f) diff --git a/test cases/common/138 include order/sub2/meson.build b/test cases/common/138 include order/sub2/meson.build index 7b49d6a..b1e6190 100644 --- a/test cases/common/138 include order/sub2/meson.build +++ b/test cases/common/138 include order/sub2/meson.build @@ -1 +1,2 @@ j = include_directories('.') +wronginc = declare_dependency(include_directories : j) diff --git a/test cases/common/138 include order/sub4/meson.build b/test cases/common/138 include order/sub4/meson.build index 538899a..ab4c455 100644 --- a/test cases/common/138 include order/sub4/meson.build +++ b/test cases/common/138 include order/sub4/meson.build @@ -2,3 +2,5 @@ e = executable('someexe', 'main.c', c_args : ['-I' + sub3], include_directories : j, dependencies : dep) + +correctinc = declare_dependency(include_directories : include_directories('.')) |