diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-04-02 11:39:45 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-04-02 11:39:45 +0200 |
| commit | 6da0df95c11fac6037d421ae8cf80af146d321da (patch) | |
| tree | ae222b0a196cfac4f62c79c902dae7d98d5413ed /test cases/unit | |
| parent | 1937bbafac07df48e78fea96a8c3c086db564574 (diff) | |
| download | meson-6da0df95c11fac6037d421ae8cf80af146d321da.zip meson-6da0df95c11fac6037d421ae8cf80af146d321da.tar.gz meson-6da0df95c11fac6037d421ae8cf80af146d321da.tar.bz2 | |
mintro: fix some interpreter crashes
Diffstat (limited to 'test cases/unit')
| -rw-r--r-- | test cases/unit/55 introspection/meson.build | 7 | ||||
| -rw-r--r-- | test cases/unit/55 introspection/meson_options.txt | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/test cases/unit/55 introspection/meson.build b/test cases/unit/55 introspection/meson.build index 15eb1ed..588f71c 100644 --- a/test cases/unit/55 introspection/meson.build +++ b/test cases/unit/55 introspection/meson.build @@ -4,6 +4,11 @@ dep1 = dependency('threads') dep2 = dependency('zlib', required: false) dep3 = dependency('bugDep1', required: get_option('test_opt1')) +b1 = get_option('test_opt1') +b2 = get_option('test_opt2') +test_bool = b1 or b2 +test_bool = b1 and b2 + if false dependency('somethingthatdoesnotexist', required: true) dependency('look_i_have_a_fallback', fallback: ['oh_no', 'the_subproject_does_not_exist']) @@ -12,7 +17,7 @@ endif subdir('sharedlib') subdir('staticlib') -t1 = executable('test1', 't1.cpp', link_with: [sharedlib], install: true) +t1 = executable('test1', 't1.cpp', link_with: [sharedlib], install: true, build_by_default: get_option('test_opt2')) t2 = executable('test2', 't2.cpp', link_with: [staticlib]) t3 = executable('test3', 't3.cpp', link_with: [sharedlib, staticlib], dependencies: [dep1]) diff --git a/test cases/unit/55 introspection/meson_options.txt b/test cases/unit/55 introspection/meson_options.txt index b2956c8..fc5cb4d 100644 --- a/test cases/unit/55 introspection/meson_options.txt +++ b/test cases/unit/55 introspection/meson_options.txt @@ -1 +1,2 @@ option('test_opt1', type: 'boolean', value: false, description: 'simple boolean flag') +option('test_opt2', type: 'boolean', value: true, description: 'simple boolean flag') |