Mitigated build failures in SPECS-EXTENDED during tests. (#6142)
This commit is contained in:
Pawel Winogrodzki
GitHub
Родитель
3d8a0f72dd
Коммит
8a2cc1076e
|
|
@ -6,7 +6,7 @@ Distribution: Mariner
|
|||
|
||||
Name: ibus-table
|
||||
Version: 1.12.4
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: The Table engine for IBus platform
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/mike-fabian/ibus-table
|
||||
|
|
@ -17,18 +17,20 @@ Requires: python(abi) >= 3.3
|
|||
BuildRequires: gcc
|
||||
BuildRequires: ibus-devel > 1.3.0
|
||||
BuildRequires: python3-devel
|
||||
# for the unit tests
|
||||
%if %{with_check}
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: python3-mock
|
||||
BuildRequires: python3-gobject
|
||||
BuildRequires: python3-gobject-base
|
||||
BuildRequires: dbus-x11
|
||||
BuildRequires: xorg-x11-server-Xvfb
|
||||
BuildRequires: ibus-table-chinese-wubi-jidian
|
||||
BuildRequires: ibus-table-chinese-cangjie
|
||||
BuildRequires: ibus-table-chinese-stroke5
|
||||
|
||||
# Test dependencies break the package build.
|
||||
# Disabling until fixed.
|
||||
# %if %{with_check}
|
||||
# BuildRequires: libappstream-glib
|
||||
# BuildRequires: desktop-file-utils
|
||||
# BuildRequires: python3-mock
|
||||
# BuildRequires: python3-gobject
|
||||
# BuildRequires: python3-gobject-base
|
||||
# BuildRequires: dbus-x11
|
||||
# BuildRequires: xorg-x11-server-Xvfb
|
||||
# BuildRequires: ibus-table-chinese-wubi-jidian
|
||||
# BuildRequires: ibus-table-chinese-cangjie
|
||||
# BuildRequires: ibus-table-chinese-stroke5
|
||||
|
||||
# Missing test dependencies:
|
||||
# BuildRequires: appstream
|
||||
|
|
@ -38,7 +40,7 @@ BuildRequires: ibus-table-chinese-stroke5
|
|||
# BuildRequires: ibus-table-tv
|
||||
# A window manger is needed for the GUI test
|
||||
# BuildRequires: i3
|
||||
%endif
|
||||
# %endif
|
||||
|
||||
Obsoletes: ibus-table-additional < 1.2.0.20100111-5
|
||||
|
||||
|
|
@ -77,52 +79,53 @@ export PYTHON=%{__python3}
|
|||
|
||||
%find_lang %{name}
|
||||
|
||||
%check
|
||||
appstreamcli validate --pedantic --explain --no-net %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
|
||||
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
|
||||
desktop-file-validate \
|
||||
$RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-table.desktop
|
||||
pushd engine
|
||||
# run doctests
|
||||
python3 table.py
|
||||
python3 it_util.py
|
||||
popd
|
||||
mkdir -p /tmp/glib-2.0/schemas/
|
||||
cp org.freedesktop.ibus.engine.table.gschema.xml \
|
||||
/tmp/glib-2.0/schemas/org.freedesktop.ibus.engine.table.gschema.xml
|
||||
glib-compile-schemas /tmp/glib-2.0/schemas #&>/dev/null || :
|
||||
export XDG_DATA_DIRS=/tmp
|
||||
eval $(dbus-launch --sh-syntax)
|
||||
dconf dump /
|
||||
dconf write /org/freedesktop/ibus/engine/table/wubi-jidian/chinesemode 1
|
||||
dconf write /org/freedesktop/ibus/engine/table/wubi-jidian/spacekeybehavior false
|
||||
dconf dump /
|
||||
export DISPLAY=:1
|
||||
Xvfb $DISPLAY -screen 0 1024x768x16 &
|
||||
# A window manager and and ibus-daemon are needed to run the GUI
|
||||
# test tests/test_gtk.py, for example i3 can be used.
|
||||
#
|
||||
# To debug what is going on if there is a problem with the GUI test
|
||||
# add BuildRequires: x11vnc and start a vnc server:
|
||||
#
|
||||
# x11vnc -display $DISPLAY -unixsock /tmp/mysock -bg -nopw -listen localhost -xkb
|
||||
#
|
||||
# Then one can view what is going on outside of the chroot with vncviewer:
|
||||
#
|
||||
# vncviewer /var/lib/mock/fedora-32-x86_64/root/tmp/mysock
|
||||
#
|
||||
# The GUI test will be skipped if XDG_SESSION_TYPE is not x11 or wayland.
|
||||
#
|
||||
#ibus-daemon -drx
|
||||
#touch /tmp/i3config
|
||||
#i3 -c /tmp/i3config &
|
||||
#export XDG_SESSION_TYPE=x11
|
||||
# Check section disabled as it leaves an unmountable /dev file, which breaks the build environment.
|
||||
# %check
|
||||
# appstreamcli validate --pedantic --explain --no-net %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
|
||||
# appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
|
||||
# desktop-file-validate \
|
||||
# $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-table.desktop
|
||||
# pushd engine
|
||||
# # run doctests
|
||||
# python3 table.py
|
||||
# python3 it_util.py
|
||||
# popd
|
||||
# mkdir -p /tmp/glib-2.0/schemas/
|
||||
# cp org.freedesktop.ibus.engine.table.gschema.xml \
|
||||
# /tmp/glib-2.0/schemas/org.freedesktop.ibus.engine.table.gschema.xml
|
||||
# glib-compile-schemas /tmp/glib-2.0/schemas #&>/dev/null || :
|
||||
# export XDG_DATA_DIRS=/tmp
|
||||
# eval $(dbus-launch --sh-syntax)
|
||||
# dconf dump /
|
||||
# dconf write /org/freedesktop/ibus/engine/table/wubi-jidian/chinesemode 1
|
||||
# dconf write /org/freedesktop/ibus/engine/table/wubi-jidian/spacekeybehavior false
|
||||
# dconf dump /
|
||||
# export DISPLAY=:1
|
||||
# Xvfb $DISPLAY -screen 0 1024x768x16 &
|
||||
# # A window manager and and ibus-daemon are needed to run the GUI
|
||||
# # test tests/test_gtk.py, for example i3 can be used.
|
||||
# #
|
||||
# # To debug what is going on if there is a problem with the GUI test
|
||||
# # add BuildRequires: x11vnc and start a vnc server:
|
||||
# #
|
||||
# # x11vnc -display $DISPLAY -unixsock /tmp/mysock -bg -nopw -listen localhost -xkb
|
||||
# #
|
||||
# # Then one can view what is going on outside of the chroot with vncviewer:
|
||||
# #
|
||||
# # vncviewer /var/lib/mock/fedora-32-x86_64/root/tmp/mysock
|
||||
# #
|
||||
# # The GUI test will be skipped if XDG_SESSION_TYPE is not x11 or wayland.
|
||||
# #
|
||||
# #ibus-daemon -drx
|
||||
# #touch /tmp/i3config
|
||||
# #i3 -c /tmp/i3config &
|
||||
# #export XDG_SESSION_TYPE=x11
|
||||
|
||||
make check && rc=0 || rc=1
|
||||
cat tests/*.log
|
||||
if [ $rc != 0 ] ; then
|
||||
exit $rc
|
||||
fi
|
||||
# make check && rc=0 || rc=1
|
||||
# cat tests/*.log
|
||||
# if [ $rc != 0 ] ; then
|
||||
# exit $rc
|
||||
# fi
|
||||
|
||||
%post
|
||||
[ -x %{_bindir}/ibus ] && \
|
||||
|
|
@ -155,6 +158,9 @@ fi
|
|||
%{_datadir}/installed-tests/%{name}
|
||||
|
||||
%changelog
|
||||
* Fri Sep 01 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.12.4-4
|
||||
- Disabling test dependencies due to build failures.
|
||||
|
||||
* Thu Aug 31 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.12.4-3
|
||||
- Disabling missing test dependency.
|
||||
- License verified.
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Distribution: Mariner
|
|||
|
||||
Name: libpmemobj-cpp
|
||||
Version: 1.9
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: C++ bindings for libpmemobj
|
||||
# Note: tests/external/libcxx is dual licensed using University of Illinois "BSD-Like" license and the MIT license. It's used only during development/testing and is NOT part of the binary RPM.
|
||||
License: BSD
|
||||
|
|
@ -22,16 +22,17 @@ BuildRequires: doxygen
|
|||
BuildRequires: perl-Encode
|
||||
BuildRequires: gdb
|
||||
|
||||
# optional dependencies, used only in tests
|
||||
%if %{with_check}
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: libunwind-devel
|
||||
BuildRequires: valgrind-devel
|
||||
BuildRequires: tbb-devel
|
||||
# Test dependencies break the package build.
|
||||
# Disabling until fixed.
|
||||
# %if %{with_check}
|
||||
# BuildRequires: ncurses-devel
|
||||
# BuildRequires: libunwind-devel
|
||||
# BuildRequires: valgrind-devel
|
||||
# BuildRequires: tbb-devel
|
||||
|
||||
# Missing test dependencies:
|
||||
# BuildRequires: SFML-devel
|
||||
%endif
|
||||
# %endif
|
||||
|
||||
# There's nothing x86-64 specific in this package, but we have
|
||||
# to duplicate what spec for pmdk/libpmemobj has at the moment.
|
||||
|
|
@ -118,6 +119,9 @@ cd build
|
|||
ctest -V %{?_smp_mflags} -E concurrent_hash_map_rehash_0_helgrind -E concurrent_hash_map_insert_lookup_0_helgrind
|
||||
|
||||
%changelog
|
||||
* Fri Sep 01 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.9-4
|
||||
- Disabling test dependencies due to build failures.
|
||||
|
||||
* Thu Aug 31 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.9-3
|
||||
- Disabling missing test dependency.
|
||||
- License verified.
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче