diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-04-12 14:04:30 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-05-02 13:25:57 -0700 |
| commit | 98b7b0f5c22ed7060069ae023c74a00617349210 (patch) | |
| tree | 06dd9d7438508739562aa0715005d037092aa51c | |
| parent | 16463046b10818910da72d892d53663496179606 (diff) | |
| download | meson-98b7b0f5c22ed7060069ae023c74a00617349210.zip meson-98b7b0f5c22ed7060069ae023c74a00617349210.tar.gz meson-98b7b0f5c22ed7060069ae023c74a00617349210.tar.bz2 | |
tests: Extend tests that use Threads internally to set method
It turns out there's a bug in creating a sub dependency out of threads
in that we pass all of the kwargs from the parent to the
ThreadDependency instance. This demonstrates the bug.
| -rw-r--r-- | test cases/frameworks/15 llvm/meson.build | 2 | ||||
| -rw-r--r-- | test cases/frameworks/2 gtest/meson.build | 2 | ||||
| -rw-r--r-- | test cases/frameworks/3 gmock/meson.build | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build index b43bb87..fc75084 100644 --- a/test cases/frameworks/15 llvm/meson.build +++ b/test cases/frameworks/15 llvm/meson.build @@ -1,6 +1,6 @@ project('llvmtest', ['c', 'cpp'], default_options : ['c_std=c99']) -d = dependency('llvm', required : false) +d = dependency('llvm', required : false, method : 'config-tool') if not d.found() d = dependency('llvm', required : false, static : true) if not d.found() diff --git a/test cases/frameworks/2 gtest/meson.build b/test cases/frameworks/2 gtest/meson.build index e5418e9..3f30215 100644 --- a/test cases/frameworks/2 gtest/meson.build +++ b/test cases/frameworks/2 gtest/meson.build @@ -4,7 +4,7 @@ gtest = dependency('gtest', main : true, required : false) if not gtest.found() error('MESON_SKIP_TEST: gtest not installed.') endif -gtest_nomain = dependency('gtest', main : false) +gtest_nomain = dependency('gtest', main : false, method : 'system') e = executable('testprog', 'test.cc', dependencies : gtest) test('gtest test', e) diff --git a/test cases/frameworks/3 gmock/meson.build b/test cases/frameworks/3 gmock/meson.build index 516547f..58591ae 100644 --- a/test cases/frameworks/3 gmock/meson.build +++ b/test cases/frameworks/3 gmock/meson.build @@ -3,7 +3,7 @@ project('gmock test', 'cpp') # Using gmock without gtest is a pain so just # don't support that then. -gtest = dependency('gtest', main : true, required : false) +gtest = dependency('gtest', main : true, required : false, method : 'system') if not gtest.found() error('MESON_SKIP_TEST: gtest not installed.') endif |