Compare commits

...
Sign in to create a new pull request.

11 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
5 changed files with 51 additions and 69 deletions

View file

@ -8,7 +8,11 @@ Summary: C++ unit testing framework
# no license in files
License: LGPL-2.1-or-later
Url: https://www.freedesktop.org/wiki/Software/cppunit/
Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz
Source: https://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz
# 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++

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,63 +0,0 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Makefile 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/.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export TEST=/tools/cppunit/Sanity/basic-test
export TESTVERSION=1.0
BUILT_FILES=
FILES=$(METADATA) runtest.sh Makefile PURPOSE hello.cpp
.PHONY: all install download clean
run: $(FILES) build
./runtest.sh
build: $(BUILT_FILES)
test -x runtest.sh || chmod a+x runtest.sh
clean:
rm -f *~ $(BUILT_FILES)
include /usr/share/rhts/lib/rhts-make.include
$(METADATA): Makefile
@echo "Owner: Edjunior Machado <emachado@redhat.com>" > $(METADATA)
@echo "Name: $(TEST)" >> $(METADATA)
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
@echo "Path: $(TEST_DIR)" >> $(METADATA)
@echo "Description: cppunit basic test" >> $(METADATA)
@echo "Type: Sanity" >> $(METADATA)
@echo "TestTime: 1h" >> $(METADATA)
@echo "RunFor: cppunit" >> $(METADATA)
@echo "Requires: gcc-c++ cppunit cppunit-devel" >> $(METADATA)
@echo "Priority: Normal" >> $(METADATA)
@echo "License: GPLv2+" >> $(METADATA)
@echo "Confidential: no" >> $(METADATA)
@echo "Destructive: no" >> $(METADATA)
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
rhts-lint $(METADATA)

View file

@ -1,3 +0,0 @@
PURPOSE of /tools/cppunit/Sanity/basic-test
Description: cppunit basic test
Author: Edjunior Machado <emachado@redhat.com>

View file

@ -5,9 +5,10 @@ component:
- cppunit
test: ./runtest.sh
framework: beakerlib
recommend:
require:
- bash
- coreutils
- gcc-c++
- cppunit
- cppunit-devel
duration: 1h
extra-summary: /tools/cppunit/Sanity/basic-test