Compare commits

...

No commits in common. "c8s" and "1158970a2d0c94cb40be312336d4aa413543de95" have entirely different histories.

8 changed files with 131 additions and 41 deletions

View File

@ -1 +1 @@
2c10a4c09af75f32d58239097ab249ec60f38e88 SOURCES/check-0.12.0.tar.gz
0389149a760a37e915f585bf84f268d9880a0faf check-0.15.2.tar.gz

4
.gitignore vendored
View File

@ -1 +1,3 @@
SOURCES/check-0.12.0.tar.gz
/0.10.0.tar.gz
/0.11.0.tar.gz
/check-*.tar.gz

View File

@ -1,5 +1,5 @@
--- tests/check_check_master.c.orig 2018-01-29 20:33:55.033001412 -0700
+++ tests/check_check_master.c 2018-01-29 20:34:31.501879454 -0700
--- check-0.11.0/tests/check_check_master.c.orig 2018-01-29 20:33:55.033001412 -0700
+++ check-0.11.0/tests/check_check_master.c 2018-01-29 20:34:31.501879454 -0700
@@ -214,7 +214,7 @@ static master_test_t master_tests[] = {
{ "Simple Tests", "test_ck_assert_ldouble_ge", CK_FAILURE, CK_MSG_TEXT, "Assertion 'x >= y' failed: x == 2.5, y == 3" },
{ "Simple Tests", "test_ck_assert_ldouble_ge_with_mod", CK_FAILURE, CK_MSG_TEXT, "Assertion '2%d >= 3%f' failed: 2%d == 0, 3%f == 1" },
@ -9,8 +9,8 @@
{ "Simple Tests", "test_ck_assert_ldouble_eq_tol_with_mod", CK_FAILURE, CK_MSG_TEXT, "Assertion 'fabsl(2%f - 3%d) < 2%p' failed: 3%d == 1, 2%f == 0, 2%p == 0" },
{ "Simple Tests", "test_ck_assert_ldouble_ne_tol", CK_FAILURE, CK_MSG_TEXT, "Assertion 'fabsl(y - x) >= t' failed: x == 0.001, y == 0.002, t == 0.01" },
{ "Simple Tests", "test_ck_assert_ldouble_ne_tol_with_mod", CK_FAILURE, CK_MSG_TEXT, "Assertion 'fabsl(3%f - 3%d) >= 3%p' failed: 3%d == 1, 3%f == 1, 3%p == 1" },
--- tests/check_check_sub.c.orig 2017-10-20 06:44:10.000000000 -0600
+++ tests/check_check_sub.c 2018-01-29 20:33:55.034001409 -0700
--- check-0.11.0/tests/check_check_sub.c.orig 2017-10-20 06:44:10.000000000 -0600
+++ check-0.11.0/tests/check_check_sub.c 2018-01-29 20:33:55.034001409 -0700
@@ -1812,7 +1812,7 @@ START_TEST(test_ck_assert_ldouble_eq_tol
y*=10.0l;
t*=10.0l;

5
check.rpmlintrc Normal file
View File

@ -0,0 +1,5 @@
# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON
# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors
# Documentation is in the devel subpackage
addFilter(r'check-static\.[^:]+: W: no-documentation')

View File

@ -1,6 +1,6 @@
Name: check
Version: 0.12.0
Release: 2%{?dist}
Version: 0.15.2
Release: 6%{?dist}
Summary: A unit test framework for C
Source0: https://github.com/libcheck/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
License: LGPLv2+
@ -10,14 +10,16 @@ Patch0: %{name}-0.11.0-info-in-builddir.patch
# Fix test failures due to varying floating point behavior across platforms
Patch1: %{name}-0.11.0-fp.patch
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: libtool
BuildRequires: make
BuildRequires: patchutils
BuildRequires: pkgconfig
BuildRequires: texinfo
Requires(post): info
Requires(preun): info
%if ! 0%{?rhel}
BuildRequires: pkgconfig(libsubunit)
%endif
BuildRequires: texinfo, texlive-tex, graphviz
%description
Check is a unit test framework for C. It features a simple interface for
@ -28,7 +30,6 @@ The output from unit tests can be used within source code editors and IDEs.
%package devel
Summary: Libraries and headers for developing programs with check
Requires: pkgconfig
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@ -55,69 +56,79 @@ programs suitable for use with the Check unit test framework.
%if 0%{?fedora}
%patch0 -p1 -b .info-in-builddir
%endif
%patch1
%patch1 -p1
# Fix detection of various time-related function declarations
sed -e '/DECLS(\[a/s|)|,,,[AC_INCLUDES_DEFAULT\n[#include <time.h>\n #include <sys/time.h>]]&|' \
-i configure.ac
# Get rid of version control files
find . -name .cvsignore -exec rm {} +
find . -name .cvsignore -delete
# Regenerate configure due to patch 0
autoreconf -ivf
%build
%configure
# Fix libdir for the cmake build
sed -i 's,set(libdir .*),set(libdir "%{_libdir}"),' CMakeLists.txt
# Get rid of undesirable hardcoded rpaths
%build
# The autotools build does not create the cmake files.
# The cmake build does not create the info or aclocal files.
# Therefore we build with both and combine the results to get everything.
mkdir autotools_build
cd autotools_build
%global _configure ../configure
%configure --disable-timeout-tests
# Get rid of undesirable hardcoded rpaths; workaround libtool reordering
# -Wl,--as-needed after all the libraries.
sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
-e 's|CC="\(.*g..\)"|CC="\1 -Wl,--as-needed"|' \
-i libtool
make %{?_smp_mflags}
%make_build
cd -
%cmake -DCHECK_ENABLE_TIMEOUT_TESTS:BOOL=OFF .
%cmake_build
%install
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
cd autotools_build
%make_install
rm -rf %{buildroot}%{_libdir}
rm -rf %{buildroot}%{_infodir}/dir
rm -rf %{buildroot}%{_docdir}/%{name}
cd -
%cmake_install
%check
cd autotools_build
export LD_LIBRARY_PATH=$PWD/src/.libs
%ifnarch s390x
make check
%endif
# Don't need to package the sh, log or trs files
# when we scoop the other checkmk/test files for doc
rm -rf checkmk/test/check_checkmk*
# these files are empty
rm -rf checkmk/test/empty_input
cd -
%post
/sbin/ldconfig
if [ -e %{_infodir}/%{name}.info* ]; then
/sbin/install-info \
--entry='* Check: (check). A unit testing framework for C.' \
%{_infodir}/%{name}.info %{_infodir}/dir || :
fi
%postun -p /sbin/ldconfig
%preun
if [ $1 = 0 -a -e %{_infodir}/%{name}.info* ]; then
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi
%ldconfig_scriptlets
%files
%doc AUTHORS ChangeLog
%doc AUTHORS NEWS
%license COPYING.LESSER
%{_libdir}/libcheck.so.*
%{_libdir}/libcheck.so.0*
%{_infodir}/check*
%files devel
%doc doc/example
%{_includedir}/check.h
%{_includedir}/check_stdint.h
%{_libdir}/cmake/check/
%{_libdir}/libcheck.so
%{_libdir}/pkgconfig/check.pc
%{_datadir}/aclocal/check.m4
@ -134,8 +145,73 @@ fi
%{_mandir}/man1/checkmk.1*
%changelog
* Mon Jun 25 2018 Petr Viktorin <pviktori@redhat.com> - 0.12.0-2
- Build without subunit support
* Tue Oct 26 2021 Peter Hutterer <peter.hutterer@redhat.com> 0.15.2-6
- Fix the pkgconfig file for lib64 (#2016941)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.15.2-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.15.2-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Mar 01 2021 Tomas Popela <tpopela@redhat.com> - 0.15.2-3
- Don't build with subinit support in RHEL
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sun Aug 9 2020 Jerry James <loganjerry@gmail.com> - 0.15.2-1
- Version 0.15.2
- Drop upstreamed -fail-macros patch
* Mon Aug 3 2020 Jerry James <loganjerry@gmail.com> - 0.15.1-3
- Add -fail-macros patch
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jul 23 2020 Jerry James <loganjerry@gmail.com> - 0.15.1-1
- Version 0.15.1
- Drop upstreamed -format-spec patch
* Tue Jun 23 2020 Jerry James <loganjerry@gmail.com> - 0.15.0-2
- Drop -attribute-format patch, causes other issues (bz 1850198)
* Mon Jun 22 2020 Jerry James <loganjerry@gmail.com> - 0.15.0-1
- Version 0.15.0
- Add -formatspec and -attribute-format patches
- Build with both cmake and autotools
* Fri Jan 31 2020 Tom Callaway <spot@fedoraproject.org> - 0.14.0-3
- disable tests on s390x
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 27 2020 Tom Callaway <spot@fedoraproject.org> - 0.14.0-1
- update to 0.14.0
* Mon Dec 2 2019 Tom Callaway <spot@fedoraproject.org> - 0.13.0-2
- package NEWS instead of the obsolete ChangeLog file
* Tue Oct 22 2019 Tom Callaway <spot@fedoraproject.org> - 0.13.0-1
- update to 0.13.0
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jul 23 2018 Jerry James <loganjerry@gmail.com> - 0.12.0-3
- Disable unreliable timeout tests (sometimes fail on busy builders)
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Mon Jan 29 2018 Jerry James <loganjerry@gmail.com> - 0.12.0-1
- Update to 0.12.0

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (check-0.15.2.tar.gz) = cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e