diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-06 19:19:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 19:19:06 +0300 |
| commit | 09a722c4bd6bf3014190ecc4d91eee1110affd99 (patch) | |
| tree | d90a1df01feb683efa47cb75b87e26ba3eef11c4 /test cases | |
| parent | 27c5d9f16f535b2aacdf009744d4f99d59b9c81f (diff) | |
| parent | 82e36a6bfe3c765e81438492bdff81e248f11c53 (diff) | |
| download | meson-09a722c4bd6bf3014190ecc4d91eee1110affd99.zip meson-09a722c4bd6bf3014190ecc4d91eee1110affd99.tar.gz meson-09a722c4bd6bf3014190ecc4d91eee1110affd99.tar.bz2 | |
Merge pull request #5263 from Ericson2314/per-machine-cli-args
Per machine 'build_' and '' options
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/unit/50 std remains/meson.build | 2 | ||||
| -rw-r--r-- | test cases/unit/50 std remains/prog.c | 1 | ||||
| -rw-r--r-- | test cases/unit/55 pkg_config_path option/build_extra_path/totally_made_up_dep.pc | 7 | ||||
| -rw-r--r-- | test cases/unit/55 pkg_config_path option/host_extra_path/totally_made_up_dep.pc (renamed from test cases/unit/55 pkg_config_path option/extra_path/totally_made_up_dep.pc) | 0 | ||||
| -rw-r--r-- | test cases/unit/55 pkg_config_path option/meson.build | 11 |
5 files changed, 20 insertions, 1 deletions
diff --git a/test cases/unit/50 std remains/meson.build b/test cases/unit/50 std remains/meson.build new file mode 100644 index 0000000..ac6f9e2 --- /dev/null +++ b/test cases/unit/50 std remains/meson.build @@ -0,0 +1,2 @@ +project('std_remains', 'c', default_options: ['c_std=c99']) +executable('prog', 'prog.c') diff --git a/test cases/unit/50 std remains/prog.c b/test cases/unit/50 std remains/prog.c new file mode 100644 index 0000000..0314ff1 --- /dev/null +++ b/test cases/unit/50 std remains/prog.c @@ -0,0 +1 @@ +int main(int argc, char **argv) { return 0; } diff --git a/test cases/unit/55 pkg_config_path option/build_extra_path/totally_made_up_dep.pc b/test cases/unit/55 pkg_config_path option/build_extra_path/totally_made_up_dep.pc new file mode 100644 index 0000000..5b149f6 --- /dev/null +++ b/test cases/unit/55 pkg_config_path option/build_extra_path/totally_made_up_dep.pc @@ -0,0 +1,7 @@ +prefix=/ +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: totally_made_up_dep +Description: completely and totally made up for a test case +Version: 4.5.6 diff --git a/test cases/unit/55 pkg_config_path option/extra_path/totally_made_up_dep.pc b/test cases/unit/55 pkg_config_path option/host_extra_path/totally_made_up_dep.pc index 6d08687..6d08687 100644 --- a/test cases/unit/55 pkg_config_path option/extra_path/totally_made_up_dep.pc +++ b/test cases/unit/55 pkg_config_path option/host_extra_path/totally_made_up_dep.pc diff --git a/test cases/unit/55 pkg_config_path option/meson.build b/test cases/unit/55 pkg_config_path option/meson.build index 623c3a2..3af6164 100644 --- a/test cases/unit/55 pkg_config_path option/meson.build +++ b/test cases/unit/55 pkg_config_path option/meson.build @@ -1,3 +1,12 @@ project('pkg_config_path option') -dependency('totally_made_up_dep', method : 'pkg-config') +build = dependency('totally_made_up_dep', native: true, method : 'pkg-config') +host = dependency('totally_made_up_dep', native: false, method : 'pkg-config') + +# TODO always test we can do this separately +if meson.is_cross_build() + assert(build.version() == '4.5.6', 'wrong version for build machine dependency') +else + assert(host.version() == '1.2.3', 'wrong version for host machine dependency') +endif +assert(host.version() == '1.2.3', 'wrong version for host machine dependency') |