Compare commits

...

71 commits

Author SHA1 Message Date
Fedora Release Engineering
87f035d1fa Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 18:45:58 +00:00
Fedora Release Engineering
361280b7ca Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 14:44:21 +00:00
Fedora Release Engineering
514c60ea82 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 20:07:03 +00:00
Petr Písař
ddce20592f tests: Remove unused remnants of Beaker
The Makefile and PURPOSE files are remnants of a RHEL Beaker test
system which was converted into TMT test system as a main.fmf file.
The two files are not used anymore and can be removed.
2024-05-03 14:19:15 +02:00
David Tardon
55141d8aad Merge #6 Refer to sources with HTTPS 2024-05-03 12:05:11 +00:00
Petr Písař
989836a857 Refer to sources with HTTPS 2024-04-30 14:34:21 +02:00
Petr Písař
902beef560 tests: Fix TMT dependencies
Those are hard dependencies and they were incomplete.
2024-04-30 14:25:28 +02:00
Fedora Release Engineering
55a0dd2157 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 08:17:23 +00:00
Fedora Release Engineering
80c2931f5c Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 16:17:28 +00:00
Mattia Verga
beaea53af7 Backport patch to run tests in deterministic order 2023-08-24 08:51:48 +02:00
Fedora Release Engineering
4266f011a5 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 16:30:34 +00:00
Fedora Release Engineering
31153821eb Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 00:36:20 +00:00
Edjunior Machado
023a4e8d0c tests: Fix fmf plan deprecated attributes 2022-12-09 17:09:46 +01:00
David Tardon
fe4e258d13 Convert to rpmautospec 2022-11-21 21:03:21 +01:00
David Tardon
f66f9ad8e1 Convert license to SPDX 2022-11-21 21:03:19 +01:00
Fedora Release Engineering
afbed4528b Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 23:41:04 +00:00
David Tardon
9dd1edd4ea Disable -Werror 2022-01-27 19:19:16 +01:00
Fedora Release Engineering
2a70334042 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 23:56:06 +00:00
Edjunior Machado
a024dea3e5 Introduce CI gating #2 2021-10-04 14:38:18 +02:00
Fedora Release Engineering
f805f0bc57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 15:09:54 +00:00
Fedora Release Engineering
9b0dbd2473 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 02:39:09 +00:00
Tom Stellard
b8c47403b0 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2020-12-17 03:57:28 +00:00
Fedora Release Engineering
d93745dc58 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 14:40:28 +00:00
Fedora Release Engineering
57d72f0b45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 14:56:28 +00:00
David Tardon
3726984e97 try again 2019-12-25 21:19:23 +01:00
David Tardon
904ab9d855 new upstream release 1.15.1 2019-12-25 12:52:54 +01:00
David Tardon
28991ff392 drop unused patches 2019-12-25 10:15:10 +01:00
David Tardon
a75d37d279 new upstream release 1.15.0 2019-12-21 13:19:19 +01:00
Fedora Release Engineering
4f6ea1131d - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-24 21:07:43 +00:00
Fedora Release Engineering
7f6d5e48f9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 16:22:36 +00:00
Fedora Release Engineering
0f84045923 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-12 22:18:53 +00:00
Rex Dieter
a6e107e673 use %make_build %make_install %ldconfig_scriptlets
-devel: tighten dep on main pkg with %_isa
2018-06-28 11:53:10 -05:00
David Tardon
19ca7014c5 add build dependency on gcc 2018-02-19 12:58:16 +01:00
Fedora Release Engineering
904fe72f08 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 05:51:21 +00:00
Fedora Release Engineering
f860376f7b - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 19:13:53 +00:00
Fedora Release Engineering
fb35d7bfcc - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 05:35:31 +00:00
David Tardon
e73ee23f77 new upstream release 1.14.0 2017-05-02 23:33:22 +02:00
Fedora Release Engineering
759d9640e3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 07:56:56 +00:00
David Tardon
c0f9286546 nitpick, use %{buildroot} 2016-02-13 13:15:42 +01:00
David Tardon
6db10f4c86 replace charset conv. by upstream patch 2016-02-13 13:14:23 +01:00
David Tardon
ba4d8933b8 ChangeLog is for devs 2016-02-13 13:14:23 +01:00
David Tardon
178f2e9af8 drop obsolete cppunit-config 2016-02-13 13:14:23 +01:00
David Tardon
b45c7357ae use %autosetup 2016-02-13 13:05:50 +01:00
David Tardon
640b7fe6e0 get sources from subdir 2016-02-13 09:52:51 +01:00
David Tardon
18c0540380 ensure no unexpected soname change sneaks in 2016-02-13 09:25:47 +01:00
David Tardon
c2bb421a6f remove rpaths 2016-02-13 08:59:06 +01:00
David Tardon
3ac81b7718 Requires: pkgconfig is auto-generated 2016-02-13 08:57:58 +01:00
David Tardon
3e625ca323 why on Earth would -devel need automake? 2016-02-13 08:57:36 +01:00
David Tardon
c5a3ce0d4d use separate lines for BuildRequires 2016-02-13 08:56:36 +01:00
David Tardon
b8f63c4263 switch to new upstream 2016-02-13 08:43:51 +01:00
David Tardon
b28290392f -doc needs license too 2016-02-12 21:36:54 +01:00
David Tardon
debb4ed6a8 use %license 2016-02-12 21:36:22 +01:00
David Tardon
9f0aaab9f5 remove cruft 2016-02-12 21:34:04 +01:00
Dennis Gilmore
d477b49a62 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 18:11:06 +00:00
Dennis Gilmore
04d85d7597 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 03:20:25 +00:00
David Tardon
c44b992f2a rebuild for yet another C++ ABI break 2015-04-11 16:48:14 +02:00
David Tardon
98c35b8cc4 rebuild for C++ stdlib ABI change in gcc5 2015-02-20 14:00:43 +01:00
Peter Robinson
41f0a43d20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-16 01:27:58 +00:00
Dennis Gilmore
66a023bbc4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 01:04:34 -05:00
David Tardon
a771b915ef rhbz#925193 add support for aarch64 2014-05-20 17:39:46 +02:00
Dennis Gilmore
ee74cae672 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-03 01:01:01 -05:00
Dennis Gilmore
e48ccc9e24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-13 13:04:13 -06:00
Dennis Gilmore
a31b7f1ed6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-18 14:47:48 -05:00
Dennis Gilmore
da2f42985b - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-12 17:57:44 -06:00
Caolán McNamara
721d701981 Resolves: sf#2912630 unused argument warnings 2011-10-05 15:58:13 +01:00
Steven M. Parrish
350c082bea Fix for bug 452340 2011-06-28 08:52:41 -04:00
Steven M. Parrish
f817b66610 Fix for bug 452340 2011-06-28 08:02:24 -04:00
Steven M. Parrish
2de5e766d0 Fix for bug 452340 2011-06-28 08:01:50 -04:00
Dennis Gilmore
d119d3235f - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-08 05:44:15 -06:00
Fedora Release Engineering
ba0d71b823 dist-git conversion 2010-07-28 12:15:30 +00:00
Bill Nottingham
1cf6b40036 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 22:47:37 +00:00
14 changed files with 420 additions and 124 deletions

View file

@ -1 +0,0 @@
cppunit-1.12.1.tar.gz

1
.fmf/version Normal file
View file

@ -0,0 +1 @@
1

6
.gitignore vendored Normal file
View file

@ -0,0 +1,6 @@
cppunit-1.12.1.tar.gz
cppunit-1.12.1.tar.gz
cppunit-1.13.2.tar.gz
/cppunit-1.14.0.tar.gz
/cppunit-1.15.0.tar.gz
/cppunit-1.15.1.tar.gz

View file

@ -1,21 +0,0 @@
# Makefile for source rpm: cppunit
# $Id$
NAME := cppunit
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

146
changelog Normal file
View file

@ -0,0 +1,146 @@
* Mon Nov 21 2022 David Tardon <dtardon@redhat.com> - 1.15.1-8
- Convert license to SPDX
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Dec 25 2019 David Tardon <dtardon@redhat.com> - 1.15.1-2
- try again
* Wed Dec 25 2019 David Tardon <dtardon@redhat.com> - 1.15.1-1
- new upstream release
* Sat Dec 21 2019 David Tardon <dtardon@redhat.com> - 1.15.0-1
- new upstream release
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Jun 28 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.14.0-5
- use %%make_build %%make_install %%ldconfig_scriptlets
- -devel: tighten dep on main pkg with %%_isa
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Tue May 02 2017 David Tardon <dtardon@redhat.com> - 1.14.0-1
- new upstream release
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sat Feb 13 2016 David Tardon <dtardon@redhat.com> - 1.13.2-2
- drop obsolete cppunit-config
* Sat Feb 13 2016 David Tardon <dtardon@redhat.com> - 1.13.2-1
- switch to new upstream
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat Apr 11 2015 David Tardon <dtardon@redhat.com> - 1.12.1-15
- rebuild for yet another C++ ABI break
* Fri Feb 20 2015 David Tardon <dtardon@redhat.com> - 1.12.1-14
- rebuild for C++ stdlib ABI change in gcc5
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue May 20 2014 David Tardon <dtardon@redhat.com> - 1.12.1-11
- rhbz#925193 add support for aarch64
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Wed Oct 05 2011 Caolán McNamara <caolanm@redhat.com> - 1.12.1-6
- add sf#2912630 fix for unused argument warnings
* Tue Jun 28 2011 Steven M. Parrish <smparrish@gmail.com> - 1.12.1-5
- Fix for bug 452340
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Thu Sep 18 2008 Patrice Dumas <pertusus@free.fr> 1.12.1-1
- Update to 1.12.1
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.12.0-5
- Autorebuild for GCC 4.3
* Mon Dec 17 2007 Patrice Dumas <pertusus@free.fr> 1.12.0-4
- remove libdir reference to cppunit-config, should fix multiarch conflict
(#340951)
- fix encoding and remove windows related files in examples
- keep timestamps
* Mon Jan 29 2007 Patrice Dumas <pertusus@free.fr> 1.12.0-3
- add rightly files to -devel (#224106)
- add necessary requires for -devel (#224106)
- ship examples
* Sun Sep 10 2006 Patrice Dumas <pertusus@free.fr> 1.12.0-2
- rebuild for FC6
* Wed Jul 5 2006 Patrice Dumas <pertusus@free.fr> 1.12.0-1
- update to 1.12
* Sun May 21 2006 Patrice Dumas <pertusus@free.fr> 1.11.6-1
- update to 1.11.6
* Wed Dec 21 2005 Patrice Dumas <pertusus@free.fr> 1.11.4-1
- update
* Mon Aug 15 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.11.0-2
- various cleanups
* Mon Jul 4 2005 Patrice Dumas <pertusus@free.fr> 1.11.0-1
- update using the fedora template
* Sat Apr 14 2001 Bastiaan Bakker <bastiaan.bakker@lifeline.nl>
- Initial release

View file

@ -1,13 +0,0 @@
diff -up cppunit-1.12.0/cppunit-config.in.nolibdir cppunit-1.12.0/cppunit-config.in
--- cppunit-1.12.0/cppunit-config.in.nolibdir 2007-10-21 11:19:40.000000000 +0200
+++ cppunit-1.12.0/cppunit-config.in 2007-10-21 11:20:01.000000000 +0200
@@ -87,9 +87,6 @@ if test "$echo_cflags" = "yes"; then
fi
if test "$echo_libs" = "yes"; then
- if test @libdir@ != /usr/lib ; then
- my_linker_flags="-L@libdir@"
- fi
echo ${my_linker_flags} -lcppunit @LIBADD_DL@
fi

View file

@ -1,17 +1,23 @@
%global apiversion 1.15
Name: cppunit
Version: 1.12.1
Release: 3%{?dist}
Version: 1.15.1
Release: %autorelease
Summary: C++ unit testing framework
# no license in files
License: LGPLv2+
Group: Development/Libraries
Url: http://cppunit.sourceforge.net/
Source: http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz
Patch0: cppunit-1.12.0-nolibdir.patch
License: LGPL-2.1-or-later
Url: https://www.freedesktop.org/wiki/Software/cppunit/
Source: https://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen, graphviz
# Backport patch to run tests in deterministic order
# https://gerrit.libreoffice.org/c/cppunit/+/123963
Patch: run-tests-in-deterministic-order.patch
BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: graphviz
BuildRequires: make
%description
CppUnit is the C++ port of the famous JUnit framework for unit testing.
@ -20,9 +26,7 @@ tests.
%package devel
Summary: Libraries and headers for cppunit development
Group: Development/Libraries
Requires: pkgconfig, automake
Requires: %{name} = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This package contains the libraries and headers necessary for developing
@ -30,114 +34,58 @@ programs that use cppunit.
%package doc
Summary: HTML formatted API documention for cppunit
Group: Documentation
%description doc
The cppunit-doc package contains HTML formatted API documention generated by
the popular doxygen documentation generation tool.
%prep
%setup -q
%patch0 -p1 -b .nolibdir
for file in THANKS ChangeLog NEWS; do
iconv -f latin1 -t utf8 < $file > ${file}.utf8
touch -c -r $file ${file}.utf8
mv ${file}.utf8 $file
done
%autosetup -p1
%build
export LDFLAGS=-ldl
%configure --enable-doxygen --disable-static
make %{?_smp_mflags}
%configure --enable-doxygen --disable-static --disable-silent-rules --disable-werror
sed -i \
-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
libtool
%make_build
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
rm $RPM_BUILD_ROOT%{_libdir}/*.la
# remove double of doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/cppunit
%make_install
# ensure that timestamp of cppunit-config is the same for all arches
touch -c -r cppunit-config.in.nolibdir $RPM_BUILD_ROOT%{_bindir}/cppunit-config
rm %{buildroot}%{_libdir}/*.la
# remove double of doc
rm -rf %{buildroot}%{_datadir}/doc/cppunit %{buildroot}%{_datadir}/%{name}/html
# clean up examples
rm -rf __dist-examples __dist-examples-dir
cp -a examples __dist-examples
make -C __dist-examples distclean
# Makefile.am files are left as documentation
find __dist-examples \( -name Makefile.in -o -name .cvsignore -o -name '*.dsw' -o -name '*.dsp' \) -exec rm {} \;
chmod a-x __dist-examples/qt/run.bat
find __dist-examples \( -name Makefile.in -o -name .gitignore -o -name '*.opt' -o -name '*.sln' -o -name '*.vcproj' \) -exec rm {} \;
mkdir __dist-examples-dir
mv __dist-examples __dist-examples-dir/examples
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ
%doc AUTHORS NEWS README THANKS TODO BUGS doc/FAQ
%license COPYING
%{_bindir}/DllPlugInTester
%{_libdir}/libcppunit*.so.*
%{_libdir}/libcppunit-%{apiversion}.so.1
%{_libdir}/libcppunit-%{apiversion}.so.1.*
%files devel
%defattr(-,root,root,-)
%{_bindir}/cppunit-config
%{_includedir}/cppunit
%{_libdir}/libcppunit.so
%{_datadir}/aclocal/cppunit.m4
%{_mandir}/man1/cppunit-config.1*
%{_libdir}/pkgconfig/cppunit.pc
%files doc
%defattr(-,root,root,-)
%license COPYING
%doc __dist-examples-dir/examples/
%doc doc/html
%changelog
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Thu Sep 18 2008 Patrice Dumas <pertusus@free.fr> 1.12.1-1
- Update to 1.12.1
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.12.0-5
- Autorebuild for GCC 4.3
* Mon Dec 17 2007 Patrice Dumas <pertusus@free.fr> 1.12.0-4
- remove libdir reference to cppunit-config, should fix multiarch conflict
(#340951)
- fix encoding and remove windows related files in examples
- keep timestamps
* Mon Jan 29 2007 Patrice Dumas <pertusus@free.fr> 1.12.0-3
- add rightly files to -devel (#224106)
- add necessary requires for -devel (#224106)
- ship examples
* Sun Sep 10 2006 Patrice Dumas <pertusus@free.fr> 1.12.0-2
- rebuild for FC6
* Wed Jul 5 2006 Patrice Dumas <pertusus@free.fr> 1.12.0-1
- update to 1.12
* Sun May 21 2006 Patrice Dumas <pertusus@free.fr> 1.11.6-1
- update to 1.11.6
* Wed Dec 21 2005 Patrice Dumas <pertusus@free.fr> 1.11.4-1
- update
* Mon Aug 15 2005 Tom "spot" Callaway <tcallawa@redhat.com> 1.11.0-2
- various cleanups
* Mon Jul 4 2005 Patrice Dumas <pertusus@free.fr> 1.11.0-1
- update using the fedora template
* Sat Apr 14 2001 Bastiaan Bakker <bastiaan.bakker@lifeline.nl>
- Initial release
%autochangelog

19
gating.yaml Normal file
View file

@ -0,0 +1,19 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

5
plans/ci.fmf Normal file
View file

@ -0,0 +1,5 @@
summary: CI Gating Plan
discover:
how: fmf
execute:
how: tmt

View file

@ -0,0 +1,43 @@
From 64eaa35c2de99581e522608e841defffb4b2923b Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 21 Oct 2021 11:14:34 +0200
Subject: [PATCH] Run tests in deterministic order
LibreOffice already benefits from this (see
<https://git.libreoffice.org/core/+/2f2246d22e2a8ccbc1dc3e6f5243734a61edf270%5E!>
"external/cppunit: Run tests in deterministic order", especially as otherwise
the order in which tests happened to get run differed between --disable-lto and
--enable-lto builds.
Change-Id: I87d6d7cb0f4c2f6a0ea1ac3ba3d48b4e089eb5c7
Reviewed-on: https://gerrit.libreoffice.org/c/cppunit/+/123963
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
diff --git a/src/cppunit/TestFactoryRegistry.cpp b/src/cppunit/TestFactoryRegistry.cpp
index 35448a6..3b68d58 100644
--- a/src/cppunit/TestFactoryRegistry.cpp
+++ b/src/cppunit/TestFactoryRegistry.cpp
@@ -143,12 +143,20 @@
void
TestFactoryRegistry::addTestToSuite( TestSuite *suite )
{
+ std::multimap<std::string, Test *> sorted;
for ( Factories::iterator it = m_factories.begin();
it != m_factories.end();
++it )
{
TestFactory *factory = *it;
- suite->addTest( factory->makeTest() );
+ Test *test = factory->makeTest();
+ sorted.insert({test->getName(), test});
+ }
+ // In the unlikely case of multiple Tests with identical names, those will
+ // still be added in random order:
+ for (auto const &i: sorted)
+ {
+ suite->addTest( i.second );
}
}

View file

@ -1 +1 @@
bd30e9cf5523cdfc019b94f5e1d7fd19 cppunit-1.12.1.tar.gz
SHA512 (cppunit-1.15.1.tar.gz) = 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691

View file

@ -0,0 +1,92 @@
#include <iostream>
#include <cppunit/TestRunner.h>
#include <cppunit/TestResult.h>
#include <cppunit/TestResultCollector.h>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/BriefTestProgressListener.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/CompilerOutputter.h>
#include <cppunit/XmlOutputter.h>
using namespace std;
class Math
{
public:
int Addition (int x, int y);
};
int
Math::Addition (int x, int y)
{
return (x + y);
}
class Test:public
CPPUNIT_NS::TestCase
{
CPPUNIT_TEST_SUITE (Test);
CPPUNIT_TEST (testAddition);
CPPUNIT_TEST_SUITE_END ();
public:
void
setUp (void);
void
tearDown (void);
protected:
void
testAddition (void);
private:
Math *
mTestObj;
};
void
Test::testAddition (void)
{
CPPUNIT_ASSERT (5 == mTestObj->Addition (2, 3));
}
void
Test::setUp (void)
{
mTestObj = new Math ();
}
void
Test::tearDown (void)
{
delete mTestObj;
}
CPPUNIT_TEST_SUITE_REGISTRATION (Test);
int
main (int ac, char **av)
{
CPPUNIT_NS::TestResult controller;
CPPUNIT_NS::TestResultCollector result;
controller.addListener (&result);
CPPUNIT_NS::BriefTestProgressListener progress;
controller.addListener (&progress);
CPPUNIT_NS::TestRunner runner;
runner.
addTest (CPPUNIT_NS::TestFactoryRegistry::getRegistry ().makeTest ());
runner.run (controller);
CPPUNIT_NS::CompilerOutputter compileroutputter (&result, std::cerr);
compileroutputter.write ();
ofstream xmlFileOut ("output.xml");
CPPUNIT_NS::XmlOutputter xmlOut (&result, xmlFileOut);
xmlOut.write ();
return result.wasSuccessful ()? 0 : 1;
}

View file

@ -0,0 +1,15 @@
summary: cppunit basic test
description: ''
contact: Edjunior Machado <emachado@redhat.com>
component:
- cppunit
test: ./runtest.sh
framework: beakerlib
require:
- bash
- coreutils
- gcc-c++
- cppunit-devel
duration: 1h
extra-summary: /tools/cppunit/Sanity/basic-test
extra-task: /tools/cppunit/Sanity/basic-test

View file

@ -0,0 +1,56 @@
#!/bin/bash
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# runtest.sh of /tools/cppunit/Sanity/basic-test
# Description: cppunit basic test
# Author: Edjunior Machado <emachado@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2021 Red Hat, Inc.
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Include Beaker environment
. /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="cppunit"
rlJournalStart
rlPhaseStartSetup
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "cp hello.cpp $TmpDir"
rlRun "pushd $TmpDir"
rlPhaseEnd
rlPhaseStartTest
rlRun "g++ -Wall -o hello hello.cpp -lcppunit"
rlAssertExists "hello"
rlRun "./hello > hello.log"
rlRun "cat hello.log"
rlAssertGrep 'Test::testAddition : OK' hello.log
rlRun "cat output.xml"
rlAssertGrep '<Name>Test::testAddition</Name>' output.xml
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd"
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd