diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2022-03-11 14:29:52 -0800 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2022-03-22 15:15:29 +0200 |
| commit | d3e3733c1a7e36777879ad73f4779c248346d960 (patch) | |
| tree | 43139148121cc22bfd789a74e2d9f0c0339a39c8 | |
| parent | f0b27964ca642a662b2f840ba2ee9c7012ced962 (diff) | |
| download | meson-d3e3733c1a7e36777879ad73f4779c248346d960.zip meson-d3e3733c1a7e36777879ad73f4779c248346d960.tar.gz meson-d3e3733c1a7e36777879ad73f4779c248346d960.tar.bz2 | |
tests/common/44: Prepend to PKG_CONFIG_PATh instead of replacing it
Which is required to make this test work when PKG_CONFIG_PATH is
required to get a working system, such as on nixos
| -rw-r--r-- | test cases/common/44 pkgconfig-gen/meson.build | 10 | ||||
| -rw-r--r-- | test cases/common/44 pkgconfig-gen/test.json | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/test cases/common/44 pkgconfig-gen/meson.build b/test cases/common/44 pkgconfig-gen/meson.build index a24c239..9f5991e 100644 --- a/test cases/common/44 pkgconfig-gen/meson.build +++ b/test cases/common/44 pkgconfig-gen/meson.build @@ -38,9 +38,15 @@ pkgg.generate( libraries_private : [lib, '-lz'], ) -test('pkgconfig-validation', pkgconfig, +env = environment() +env.prepend('PKG_CONFIG_PATH', meson.current_build_dir() / 'meson-private') + +test( + 'pkgconfig-validation', + pkgconfig, args: ['--validate', 'simple'], - env: [ 'PKG_CONFIG_PATH=' + meson.current_build_dir() + '/meson-private' ]) + env : env, +) answerlib = shared_library('answer', 'answer.c') diff --git a/test cases/common/44 pkgconfig-gen/test.json b/test cases/common/44 pkgconfig-gen/test.json index 4630a02..c2eab20 100644 --- a/test cases/common/44 pkgconfig-gen/test.json +++ b/test cases/common/44 pkgconfig-gen/test.json @@ -18,10 +18,10 @@ ], "stdout": [ { - "line": "test cases/common/44 pkgconfig-gen/meson.build:158: WARNING: Project targeting '>=0.60.0' but tried to use feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories." + "line": "test cases/common/44 pkgconfig-gen/meson.build:164: WARNING: Project targeting '>=0.60.0' but tried to use feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories." }, { - "line": "test cases/common/44 pkgconfig-gen/meson.build:164: WARNING: Project targeting '>=0.60.0' but tried to use feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories.", + "line": "test cases/common/44 pkgconfig-gen/meson.build:170: WARNING: Project targeting '>=0.60.0' but tried to use feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories.", "count": 0 }, { |