diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-01-04 21:24:57 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-01-06 14:23:53 +0000 |
| commit | bbdd6ecd4c36d5f66217fad0e53fdc42bfa59e90 (patch) | |
| tree | 0208824fd6e9fff8aa23bddd2525d746a6526b15 | |
| parent | b616abafd81e787a02b5110af63e2a53ab27b5c4 (diff) | |
| download | meson-bbdd6ecd4c36d5f66217fad0e53fdc42bfa59e90.tar.gz | |
Update PATH for python-gi tests on Windows
Update PATH for python-gi tests on Windows, since updating LD_LIBRARY_PATH
has no effect
| -rw-r--r-- | test cases/frameworks/11 gir subproject/gir/meson.build | 3 | ||||
| -rw-r--r-- | test cases/frameworks/7 gnome/gir/meson.build | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/test cases/frameworks/11 gir subproject/gir/meson.build b/test cases/frameworks/11 gir subproject/gir/meson.build index 48e0a47a0..fe40dc6a7 100644 --- a/test cases/frameworks/11 gir subproject/gir/meson.build +++ b/test cases/frameworks/11 gir subproject/gir/meson.build @@ -31,6 +31,9 @@ message('TEST: ' + girsubproject.outdir()) envdata = environment() envdata.append('GI_TYPELIB_PATH', girsubproject.outdir(), 'subprojects/mesongir', separator : ':') envdata.append('LD_LIBRARY_PATH', girsubproject.outdir(), 'subprojects/mesongir') +if ['windows', 'cygwin'].contains(host_machine.system()) + envdata.append('PATH', girsubproject.outdir(), 'subprojects/mesongir') +endif test('gobject introspection/subproject/c', girexe) test('gobject introspection/subproject/py', find_program('prog.py'), diff --git a/test cases/frameworks/7 gnome/gir/meson.build b/test cases/frameworks/7 gnome/gir/meson.build index a91cb977a..177154826 100644 --- a/test cases/frameworks/7 gnome/gir/meson.build +++ b/test cases/frameworks/7 gnome/gir/meson.build @@ -41,5 +41,8 @@ gir_paths = ':'.join([girlib.outdir(), dep1lib.outdir(), dep2lib.outdir()]) envdata = environment() envdata.append('GI_TYPELIB_PATH', gir_paths, separator : ':') envdata.append('LD_LIBRARY_PATH', gir_paths) +if ['windows', 'cygwin'].contains(host_machine.system()) + envdata.append('PATH', gir_paths) +endif test('gobject introspection/py', find_program('prog.py'), env : envdata) |