Merge pull request #2880 from jon-turney/gir-cygwin

Fix and run gobject-introspection tests on cygwin

15 files changed, 74 insertions, 22 deletions

diff --git a/ci/appveyor-install.bat b/ci/appveyor-install.bat
index 2d4a8cb53..1e6017998 100755
--- a/ci/appveyor-install.bat
+++ b/ci/appveyor-install.bat
@@ -10,10 +10,13 @@ echo Updating Cygwin and installing ninja and test prerequisites
 %CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%CACHE%" -g -P ^
 gcc-objc++,^
 gcc-objc,^
+gobject-introspection,^
 libboost-devel,^
 libglib2.0-devel,^
+libgtk3-devel,^
 ninja,^
 python3-pip,^
+vala,^
 zlib-devel
 
 echo Install done
diff --git a/run_project_tests.py b/run_project_tests.py
index 0bf5f31d1..d442dd326 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -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)
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/11 gir subproject/installed_files.txt b/test cases/frameworks/11 gir subproject/installed_files.txt
index 434481ebe..87d49a1b3 100644
--- a/test cases/frameworks/11 gir subproject/installed_files.txt
+++ b/test cases/frameworks/11 gir subproject/installed_files.txt
@@ -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
diff --git a/test cases/frameworks/12 multiple gir/installed_files.txt b/test cases/frameworks/12 multiple gir/installed_files.txt
index 9fb51bf59..a5d16bca2 100644
--- a/test cases/frameworks/12 multiple gir/installed_files.txt
+++ b/test cases/frameworks/12 multiple gir/installed_files.txt
@@ -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
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)
diff --git a/test cases/frameworks/7 gnome/installed_files.txt b/test cases/frameworks/7 gnome/installed_files.txt
index d0d51d51b..c7c704ffa 100644
--- a/test cases/frameworks/7 gnome/installed_files.txt
+++ b/test cases/frameworks/7 gnome/installed_files.txt
@@ -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
diff --git a/test cases/vala/11 generated vapi/installed_files.txt b/test cases/vala/11 generated vapi/installed_files.txt
index 5993d0161..aeaf2da7d 100644
--- a/test cases/vala/11 generated vapi/installed_files.txt
+++ b/test cases/vala/11 generated vapi/installed_files.txt
@@ -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
diff --git a/test cases/vala/11 generated vapi/libbar/bar.c b/test cases/vala/11 generated vapi/libbar/bar.c
index f0f5cb896..303714194 100644
--- a/test cases/vala/11 generated vapi/libbar/bar.c
+++ b/test cases/vala/11 generated vapi/libbar/bar.c
@@ -1,12 +1,29 @@
 #include "bar.h"
 #include "foo.h"
 
+struct _BarBar
+{
+  GObject parent_instance;
+};
+
+G_DEFINE_TYPE (BarBar, bar_bar, G_TYPE_OBJECT)
+
+static void
+bar_bar_class_init (BarBarClass *klass)
+{
+}
+
+static void
+bar_bar_init (BarBar *self)
+{
+}
+
 /**
- * bar_return_success:
+ * bar_bar_return_success:
  *
  * Returns 0
  */
-int bar_return_success(void)
+int bar_bar_return_success(void)
 {
-	return foo_return_success();
+  return foo_foo_return_success();
 }
diff --git a/test cases/vala/11 generated vapi/libbar/bar.h b/test cases/vala/11 generated vapi/libbar/bar.h
index 165b10490..4ca72704b 100644
--- a/test cases/vala/11 generated vapi/libbar/bar.h
+++ b/test cases/vala/11 generated vapi/libbar/bar.h
@@ -2,4 +2,8 @@
 
 #pragma once
 
-int bar_return_success(void);
+#define BAR_TYPE_BAR (bar_bar_get_type())
+
+G_DECLARE_FINAL_TYPE (BarBar, bar_bar, BAR, BAR, GObject)
+
+int bar_bar_return_success(void);
diff --git a/test cases/vala/11 generated vapi/libfoo/foo.c b/test cases/vala/11 generated vapi/libfoo/foo.c
index 0413ac558..dd2b891fa 100644
--- a/test cases/vala/11 generated vapi/libfoo/foo.c
+++ b/test cases/vala/11 generated vapi/libfoo/foo.c
@@ -1,11 +1,28 @@
 #include "foo.h"
 
+struct _FooFoo
+{
+  GObject parent_instance;
+};
+
+G_DEFINE_TYPE (FooFoo, foo_foo, G_TYPE_OBJECT)
+
+static void
+foo_foo_class_init (FooFooClass *klass)
+{
+}
+
+static void
+foo_foo_init (FooFoo *self)
+{
+}
+
 /**
- * foo_return_success:
+ * foo_foo_return_success:
  *
  * Returns 0
  */
-int foo_return_success(void)
+int foo_foo_return_success(void)
 {
-	return 0;
+  return 0;
 }
diff --git a/test cases/vala/11 generated vapi/libfoo/foo.h b/test cases/vala/11 generated vapi/libfoo/foo.h
index f09256d7c..e1887d8c3 100644
--- a/test cases/vala/11 generated vapi/libfoo/foo.h
+++ b/test cases/vala/11 generated vapi/libfoo/foo.h
@@ -2,4 +2,8 @@
 
 #pragma once
 
-int foo_return_success(void);
+#define FOO_TYPE_FOO (foo_foo_get_type())
+
+G_DECLARE_FINAL_TYPE (FooFoo, foo_foo, Foo, FOO, GObject)
+
+int foo_foo_return_success(void);
diff --git a/test cases/vala/11 generated vapi/main.vala b/test cases/vala/11 generated vapi/main.vala
index 303ab33ea..d61fba0f4 100644
--- a/test cases/vala/11 generated vapi/main.vala
+++ b/test cases/vala/11 generated vapi/main.vala
@@ -3,7 +3,7 @@ using Bar;
 
 class Main : GLib.Object {
     public static int main(string[] args) {
-        var ignore = Foo.return_success();
-        return Bar.return_success();
+        var ignore = Foo.Foo.return_success();
+        return Bar.Bar.return_success();
     }
 }
diff --git a/test cases/vala/7 shared library/installed_files.txt b/test cases/vala/7 shared library/installed_files.txt
index f70e439db..012b107d5 100644
--- a/test cases/vala/7 shared library/installed_files.txt
+++ b/test cases/vala/7 shared library/installed_files.txt
@@ -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
diff --git a/test cases/vala/9 gir/installed_files.txt b/test cases/vala/9 gir/installed_files.txt
index 7a0e05505..64bddeec1 100644
--- a/test cases/vala/9 gir/installed_files.txt
+++ b/test cases/vala/9 gir/installed_files.txt
@@ -1,2 +1,2 @@
-usr/lib/libfoo.so
+usr/lib/?libfoo.so
 usr/share/gir-1.0/Foo-1.0.gir