Fix installed files check for gobject-introspection tests on Cygwin

g-ir-scanner --no-libtool needed some fixes similar to [1] for Cygwin, as
well.  Now that is done, it's possible to make these tests run and pass on
Cygwin.

[1] https://bugzilla.gnome.org/show_bug.cgi?id=781525
pull/2880/head
Jon Turney 7 years ago
parent 86feb843f4
commit b616abafd8
  1. 1
      run_project_tests.py
  2. 4
      test cases/frameworks/11 gir subproject/installed_files.txt
  3. 4
      test cases/frameworks/12 multiple gir/installed_files.txt
  4. 6
      test cases/frameworks/7 gnome/installed_files.txt
  5. 4
      test cases/vala/11 generated vapi/installed_files.txt
  6. 4
      test cases/vala/7 shared library/installed_files.txt
  7. 2
      test cases/vala/9 gir/installed_files.txt

@ -185,6 +185,7 @@ def get_relative_files_list_from_dir(fromdir):
def platform_fix_name(fname, compiler):
if '?lib' in fname:
if mesonlib.is_cygwin():
fname = re.sub(r'lib/\?lib(.*)\.so$', r'bin/cyg\1.dll', fname)
fname = re.sub(r'\?lib(.*)\.dll$', r'cyg\1.dll', fname)
else:
fname = re.sub(r'\?lib', 'lib', fname)

@ -2,5 +2,5 @@ usr/lib/girepository-1.0/Meson-1.0.typelib
usr/lib/girepository-1.0/MesonSub-1.0.typelib
usr/share/gir-1.0/Meson-1.0.gir
usr/share/gir-1.0/MesonSub-1.0.gir
usr/lib/libgirsubproject.so
usr/lib/libgirlib.so
usr/lib/?libgirsubproject.so
usr/lib/?libgirlib.so

@ -1,6 +1,6 @@
usr/lib/girepository-1.0/Meson-1.0.typelib
usr/lib/girepository-1.0/MesonSub-1.0.typelib
usr/lib/libgirlib.so
usr/lib/libgirsubproject.so
usr/lib/?libgirlib.so
usr/lib/?libgirsubproject.so
usr/share/gir-1.0/Meson-1.0.gir
usr/share/gir-1.0/MesonSub-1.0.gir

@ -2,9 +2,9 @@ usr/include/enums.h
usr/include/enums2.h
usr/include/enums3.h
usr/include/marshaller.h
usr/lib/libgir_lib.so
usr/lib/libdep1lib.so
usr/lib/libdep2lib.so
usr/lib/?libgir_lib.so
usr/lib/?libdep1lib.so
usr/lib/?libdep2lib.so
usr/lib/girepository-1.0/Meson-1.0.typelib
usr/lib/girepository-1.0/MesonDep1-1.0.typelib
usr/lib/girepository-1.0/MesonDep2-1.0.typelib

@ -1,6 +1,6 @@
usr/bin/vapigen-test
usr/lib/libfoo.so
usr/lib/libbar.so
usr/lib/?libfoo.so
usr/lib/?libbar.so
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,5 +1,5 @@
usr/lib/libinstalled_vala_lib.so
usr/lib/libinstalled_vala_all.so
usr/lib/?libinstalled_vala_lib.so
usr/lib/?libinstalled_vala_all.so
usr/include/installed_vala_all.h
usr/include/valah/installed_vala_all_nolib.h
usr/include/installed_vala_onlyh.h

@ -1,2 +1,2 @@
usr/lib/libfoo.so
usr/lib/?libfoo.so
usr/share/gir-1.0/Foo-1.0.gir

Loading…
Cancel
Save