Update to a 2024-08-26 git snapshot

Additionally:

- Skip known problematic tests for now
- Fix skipping tests logic
- Build GObject Introspection documentation

Signed-off-by: Nils Philippsen <nils@tiptoe.de>
This commit is contained in:
Nils Philippsen 2024-08-26 18:56:31 +02:00
parent b7877b5d36
commit 7efc6c0a54
3 changed files with 17 additions and 4 deletions

1
.gitignore vendored
View File

@ -48,3 +48,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2
/gimp-2.99.19-git5814d9ed30.tar.xz /gimp-2.99.19-git5814d9ed30.tar.xz
/gimp-2.99.19-git4542c0156e.tar.xz /gimp-2.99.19-git4542c0156e.tar.xz
/gimp-2.99.19-git74bbe26918.tar.xz /gimp-2.99.19-git74bbe26918.tar.xz
/gimp-2.99.19-git3ded3c47fe.tar.xz

View File

@ -36,6 +36,8 @@
# When building in Koji or mock, networking isnt available. # When building in Koji or mock, networking isnt available.
%bcond skip_networking_tests 1 %bcond skip_networking_tests 1
# Skip known problematic tests
%bcond skip_problematic_tests 1
# Some tests fail under normal user environments, dont skip them by default. # Some tests fail under normal user environments, dont skip them by default.
%bcond skip_user_tests 0 %bcond skip_user_tests 0
@ -45,6 +47,9 @@
# tests known to fail if networking isnt available # tests known to fail if networking isnt available
%global skip_tests_networking gimp:desktop / appdata_file %global skip_tests_networking gimp:desktop / appdata_file
# tests known to fail for being problematic
%global skip_tests_problematic gimp:app / save-and-export
# tests known to fail in a normal user environment # tests known to fail in a normal user environment
%global skip_tests_user gimp:app / save-and-export\ %global skip_tests_user gimp:app / save-and-export\
gimp:app / single-window-mode\ gimp:app / single-window-mode\
@ -58,7 +63,7 @@ gimp:app / ui
Summary: GNU Image Manipulation Program Summary: GNU Image Manipulation Program
Name: gimp Name: gimp
Epoch: 2 Epoch: 2
Version: 2.99.19^20240824git74bbe26918 Version: 2.99.19^20240826git3ded3c47fe
Release: %autorelease Release: %autorelease
# Compute some version related macros. # Compute some version related macros.
@ -189,6 +194,7 @@ BuildRequires: pkgconfig(zlib)
BuildRequires: python3dist(pygobject) >= 3.0 BuildRequires: python3dist(pygobject) >= 3.0
BuildRequires: vala BuildRequires: vala
BuildRequires: xorg-x11-server-Xvfb BuildRequires: xorg-x11-server-Xvfb
BuildRequires: yelp-tools
Requires: gjs Requires: gjs
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
@ -312,6 +318,7 @@ sha256sum -c %{SOURCE2}
%else %else
-Denable-default-bin=disabled \ -Denable-default-bin=disabled \
%endif %endif
-Dg-ir-doc=true \
-Dilbm=disabled \ -Dilbm=disabled \
-Dbug-report-url="https://bugzilla.redhat.com/" -Dbug-report-url="https://bugzilla.redhat.com/"
@ -449,6 +456,11 @@ skip_tests="$skip_tests
%skip_tests_networking" %skip_tests_networking"
%endif %endif
%if %{with skip_problematic_tests}
skip_tests="$skip_tests
%skip_tests_problematic"
%endif
%if %{with skip_user_tests} %if %{with skip_user_tests}
skip_tests="$skip_tests skip_tests="$skip_tests
%skip_tests_user" %skip_tests_user"
@ -458,9 +470,9 @@ all_tests="$(%meson_test --list 2>/dev/null)"
suites="$(echo "$all_tests" | while read suite ignore; do echo "${suite%+*}"; done | sort -u)" suites="$(echo "$all_tests" | while read suite ignore; do echo "${suite%+*}"; done | sort -u)"
for suite in $suites; do for suite in $suites; do
suite_tests="$( suite_tests="$(
echo "$all_tests" | grep "^$suite /" | while read ignore ignore test; do echo "$all_tests" | grep "^$suite\(+\S\+\)\?" | while read ignore ignore test; do
if ! echo "$skip_tests" | grep -qFx "$suite / $test"; then echo "$test"; fi if ! echo "$skip_tests" | grep -qFx "$suite / $test"; then echo "$test"; fi
done done | sort -u
)" )"
if [ -n "$suite_tests" ]; then if [ -n "$suite_tests" ]; then
%meson_test --suite "$suite" $suite_tests %meson_test --suite "$suite" $suite_tests

View File

@ -1,2 +1,2 @@
SHA512 (gimp-2.99.19-git74bbe26918.tar.xz) = 0c42b1e25fb917bc8dc3efc726364a7145216712ecae34d36677e68baa421f1564f1407268fe9195ede491e9699a1897a527028b08b1ffe8803282c02299e547 SHA512 (gimp-2.99.19-git3ded3c47fe.tar.xz) = 8b1b4d45334dbab8ab9ccc0108b724e643c0b85b67069ef2a64b4c81da7275a6b2b2a28aa172914ecaa9f70509374c0f83a1e575c80c6e277d9615453c8924a9
SHA512 (gimp-splash.png) = e4443fa1c4eaf50ce4a89681d436d9c23ccae7e3a6cac1e853bba05d851c815c59c53d52c9f3e159460d52e03b492cc48f366f6e194b7ca8c740692eb0c2d963 SHA512 (gimp-splash.png) = e4443fa1c4eaf50ce4a89681d436d9c23ccae7e3a6cac1e853bba05d851c815c59c53d52c9f3e159460d52e03b492cc48f366f6e194b7ca8c740692eb0c2d963