From a48a2a3dc9540eb17b9e8eabdbeb6b8c72b03551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= Date: Thu, 8 Feb 2024 00:53:26 +0100 Subject: [PATCH] ci: Build testsuite for macOS To make it work on macOS, do not add typelibdir to GI_TYPELIB_PATH. While this change affects all the other jobs as well, it appears to be of no consequence. --- .gitlab-ci.yml | 1 - testsuite/headless/meson.build | 1 - testsuite/introspection/meson.build | 1 - 3 files changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da9971c992..445ba53238 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -253,7 +253,6 @@ macos-x86_64: -Dcpp_std=c++11 -Dpixman:tests=disabled -Dlibjpeg-turbo:simd=disabled - -Dbuild-testsuite=false _build - meson compile -C _build artifacts: diff --git a/testsuite/headless/meson.build b/testsuite/headless/meson.build index 1c9b5f5a78..1e9bf36a61 100644 --- a/testsuite/headless/meson.build +++ b/testsuite/headless/meson.build @@ -1,7 +1,6 @@ env = environment() env.prepend('GI_TYPELIB_PATH', project_build_root / 'gtk', - gi_dep.get_variable(pkgconfig: 'typelibdir'), ) env.prepend('LD_PRELOAD', project_build_root / 'gtk' / 'libgtk-4.so') env.prepend('MESON_CURRENT_SOURCE_DIR', meson.current_source_dir()) diff --git a/testsuite/introspection/meson.build b/testsuite/introspection/meson.build index a30c687353..a65965d633 100644 --- a/testsuite/introspection/meson.build +++ b/testsuite/introspection/meson.build @@ -1,7 +1,6 @@ env = environment() env.prepend('GI_TYPELIB_PATH', project_build_root / 'gtk', - gi_dep.get_variable(pkgconfig: 'typelibdir'), ) env.prepend('LD_PRELOAD', project_build_root / 'gtk' / 'libgtk-4.so')