Update PATH for python-gi tests on Windows

Update PATH for python-gi tests on Windows, since updating LD_LIBRARY_PATH
has no effect
pull/2880/head
Jon Turney 7 years ago
parent b616abafd8
commit bbdd6ecd4c
  1. 3
      test cases/frameworks/11 gir subproject/gir/meson.build
  2. 3
      test cases/frameworks/7 gnome/gir/meson.build

@ -31,6 +31,9 @@ message('TEST: ' + girsubproject.outdir())
envdata = environment() envdata = environment()
envdata.append('GI_TYPELIB_PATH', girsubproject.outdir(), 'subprojects/mesongir', separator : ':') envdata.append('GI_TYPELIB_PATH', girsubproject.outdir(), 'subprojects/mesongir', separator : ':')
envdata.append('LD_LIBRARY_PATH', girsubproject.outdir(), 'subprojects/mesongir') 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/c', girexe)
test('gobject introspection/subproject/py', find_program('prog.py'), test('gobject introspection/subproject/py', find_program('prog.py'),

@ -41,5 +41,8 @@ gir_paths = ':'.join([girlib.outdir(), dep1lib.outdir(), dep2lib.outdir()])
envdata = environment() envdata = environment()
envdata.append('GI_TYPELIB_PATH', gir_paths, separator : ':') envdata.append('GI_TYPELIB_PATH', gir_paths, separator : ':')
envdata.append('LD_LIBRARY_PATH', gir_paths) 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'), test('gobject introspection/py', find_program('prog.py'),
env : envdata) env : envdata)

Loading…
Cancel
Save