run_proect_tests: add cygwin as platform fix name

pull/4170/head
Marco Trevisan (Treviño) 7 years ago
parent 81e7a0981b
commit 0fc9a60189
  1. 7
      run_project_tests.py
  2. 4
      test cases/frameworks/12 multiple gir/installed_files.txt
  3. 4
      test cases/vala/11 generated vapi/installed_files.txt
  4. 4
      test cases/vala/7 shared library/installed_files.txt
  5. 2
      test cases/vala/9 gir/installed_files.txt

@ -155,7 +155,12 @@ def platform_fix_name(fname, compiler, env):
if fname.startswith('?gcc:'):
fname = fname[5:]
if compiler == 'cl' or fname.endswith('dll.a') and not mesonlib.for_cygwin(env.is_cross_build(), env):
if compiler == 'cl':
return None
if fname.startswith('?cygwin:'):
fname = fname[8:]
if compiler == 'cl' or not mesonlib.for_cygwin(env.is_cross_build(), env):
return None
return fname

@ -1,8 +1,8 @@
usr/lib/girepository-1.0/Meson-1.0.typelib
usr/lib/girepository-1.0/MesonSub-1.0.typelib
usr/lib/?libgirlib.so
?gcc:usr/lib/libgirlib.dll.a
?cygwin:usr/lib/libgirlib.dll.a
usr/lib/?libgirsubproject.so
?gcc:usr/lib/libgirsubproject.dll.a
?cygwin:usr/lib/libgirsubproject.dll.a
usr/share/gir-1.0/Meson-1.0.gir
usr/share/gir-1.0/MesonSub-1.0.gir

@ -1,8 +1,8 @@
usr/bin/vapigen-test?exe
usr/lib/?libfoo.so
?gcc:usr/lib/libfoo.dll.a
?cygwin:usr/lib/libfoo.dll.a
usr/lib/?libbar.so
?gcc:usr/lib/libbar.dll.a
?cygwin:usr/lib/libbar.dll.a
usr/share/vala/vapi/foo-1.0.vapi
usr/share/vala/vapi/foo-1.0.deps
usr/share/vala/vapi/bar-1.0.vapi

@ -1,7 +1,7 @@
usr/lib/?libinstalled_vala_lib.so
?cygwin:usr/lib/libinstalled_vala_lib.dll.a
usr/lib/?libinstalled_vala_all.so
?gcc:usr/lib/libinstalled_vala_all.dll.a
?gcc:usr/lib/libinstalled_vala_lib.dll.a
?cygwin:usr/lib/libinstalled_vala_all.dll.a
usr/include/installed_vala_all.h
usr/include/valah/installed_vala_all_nolib.h
usr/include/installed_vala_onlyh.h

@ -1,3 +1,3 @@
?gcc:usr/lib/?libfoo.so
?gcc:usr/lib/libfoo.dll.a
?cygwin:usr/lib/libfoo.dll.a
usr/share/gir-1.0/Foo-1.0.gir

Loading…
Cancel
Save