Compare commits
No commits in common. "c8" and "a128bfbd23a99a54ddb65620b87484fbf0737187" have entirely different histories.
c8
...
a128bfbd23
|
|
@ -1 +1 @@
|
|||
eb98b65d7b642a370759002c5d190cbf8f896f66 SOURCES/HdrHistogram_c-0.9.13.tar.gz
|
||||
4b1eb84702536de7e5513655f2abed33236623d0 HdrHistogram_c-0.11.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
1
|
||||
|
|
@ -1 +1,5 @@
|
|||
SOURCES/HdrHistogram_c-0.9.13.tar.gz
|
||||
.build*
|
||||
x86_64/
|
||||
HdrHistogram_c-*.rpm
|
||||
/HdrHistogram_c-*.tar.gz
|
||||
/HdrHistogram_c-0.9.12.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
Name: HdrHistogram_c
|
||||
Version: 0.9.13
|
||||
Release: 2%{?dist}
|
||||
Version: 0.11.0
|
||||
Release: 6%{?dist}
|
||||
Summary: C port of the HdrHistogram
|
||||
License: BSD and Public Domain
|
||||
URL: https://github.com/HdrHistogram/%{name}
|
||||
Source0: https://github.com/HdrHistogram/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: gcc cmake zlib-devel
|
||||
BuildRequires: gcc g++ cmake zlib-devel
|
||||
|
||||
%description
|
||||
C port of High Dynamic Range (HDR) Histogram.
|
||||
|
|
@ -25,19 +25,17 @@ developing applications that use %{name}.
|
|||
|
||||
|
||||
%build
|
||||
%cmake .
|
||||
%make_build
|
||||
%cmake -DHDR_HISTOGRAM_INSTALL_STATIC=OFF .
|
||||
%cmake_build
|
||||
|
||||
|
||||
%check
|
||||
ls test
|
||||
test/hdr_atomic_test
|
||||
test/hdr_histogram_test
|
||||
%ctest
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%make_install
|
||||
%cmake_install
|
||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
find $RPM_BUILD_ROOT
|
||||
|
||||
|
|
@ -49,15 +47,9 @@ find $RPM_BUILD_ROOT
|
|||
%files
|
||||
%license LICENSE.txt
|
||||
%doc README.md
|
||||
%exclude %{_bindir}/hiccup
|
||||
%exclude %{_bindir}/hdr_decoder
|
||||
%exclude %{_bindir}/perftest
|
||||
%exclude %{_bindir}/hdr_histogram_log_test
|
||||
%exclude %{_bindir}/hdr_histogram_test
|
||||
%exclude %{_bindir}/hdr_histogram_atomic_test
|
||||
%{_libdir}/libhdr_histogram.so.5.0.0
|
||||
%{_libdir}/libhdr_histogram.so.5
|
||||
%exclude %{_libdir}/libhdr_histogram_static.a
|
||||
%exclude %{_bindir}/*
|
||||
%{_libdir}/libhdr_histogram.so.6.1.0
|
||||
%{_libdir}/libhdr_histogram.so.6
|
||||
|
||||
%files devel
|
||||
%dir %{_includedir}/hdr
|
||||
|
|
@ -68,16 +60,35 @@ find $RPM_BUILD_ROOT
|
|||
%{_includedir}/hdr/hdr_histogram_log.h
|
||||
%{_includedir}/hdr/hdr_histogram.h
|
||||
%{_libdir}/libhdr_histogram.so
|
||||
%{_libdir}/cmake/hdr_histogram/*.cmake
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed May 20 2020 Nathan Scott <nathans@redhat.com> - 0.9.13-2
|
||||
- Rebuild for CI/gating
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.11.0-6
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.11.0-5
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.0-3
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jun 22 2020 Lukas Zapletal <lzap+rpm@redhat.com> - 0.11.0-1
|
||||
- New upstream version
|
||||
|
||||
* Wed Apr 29 2020 Nathan Scott <nathans@redhat.com> - 0.9.13-1
|
||||
- Initial version for RHEL-8 (BZ 1748643)
|
||||
- New upstream version
|
||||
|
||||
* Wed Feb 12 2020 Lukas Zapletal <lzap+rpm@redhat.com> - 0.9.12-1
|
||||
- New version
|
||||
- New upstream version
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.11-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
|
@ -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}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
summary: CI Gating Plan
|
||||
discover:
|
||||
how: fmf
|
||||
directory: tests
|
||||
execute:
|
||||
how: beakerlib
|
||||
|
|
@ -0,0 +1 @@
|
|||
SHA512 (HdrHistogram_c-0.11.0.tar.gz) = 70f18d1f28be228bc1f86cd16c55537edcdd555ec2b4f2a4cc6454a4b8d604bd72c24918e1fdb8935854aa6071f428bf793fec0e80b21116612f56c72d27c811
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
The test's Makefiles are not used in Fedora CI infrastructure. But are kept here
|
||||
for backward compatibility with traditional beakerlib test harness in RHEL.
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Makefile of /tools/HdrHistogram_c/Sanity/sanity-test
|
||||
# Description: Installs and builds HdrHistogram_c, then runs minimal upstream testsuite.
|
||||
# Author: Jan Kuřík <jkurik@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2020 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/HdrHistogram_c/Sanity/sanity-test
|
||||
export TESTVERSION=1.0
|
||||
|
||||
BUILT_FILES=
|
||||
|
||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE
|
||||
|
||||
.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: Jan Kuřík <jkurik@redhat.com>" > $(METADATA)
|
||||
@echo "Name: $(TEST)" >> $(METADATA)
|
||||
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||
@echo "Description: Installs and builds HdrHistogram_c, then runs minimal upstream testsuite." >> $(METADATA)
|
||||
@echo "Type: Sanity" >> $(METADATA)
|
||||
@echo "TestTime: 15m" >> $(METADATA)
|
||||
@echo "RunFor: HdrHistogram_c" >> $(METADATA)
|
||||
@echo "Requires: HdrHistogram_c make cmake" >> $(METADATA)
|
||||
@echo "Requires: gcc gcc-c++ rpm-build" >> $(METADATA)
|
||||
@echo "Priority: Normal" >> $(METADATA)
|
||||
@echo "License: GPLv2+" >> $(METADATA)
|
||||
@echo "Confidential: no" >> $(METADATA)
|
||||
@echo "Destructive: no" >> $(METADATA)
|
||||
@echo "Bug: 1748643" >> $(METADATA)
|
||||
@echo "Releases: -RHEL4 -RHEL6 -RHEL7 -RHELClient5 -RHELServer5 -RHEL-ALT-7" >> $(METADATA)
|
||||
|
||||
rhts-lint $(METADATA)
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
PURPOSE of /tools/HdrHistogram_c/Sanity/sanity-test
|
||||
Description: Installs and builds HdrHistogram_c, then runs minimal upstream testsuite.
|
||||
Author: Jan Kuřík <jkurik@redhat.com>
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
summary: Installs and builds HdrHistogram_c, then runs minimal upstream testsuite.
|
||||
description: ''
|
||||
contact:
|
||||
- Jan Kuřík <jkurik@redhat.com>
|
||||
component:
|
||||
- HdrHistogram_c
|
||||
test: ./runtest.sh
|
||||
framework: beakerlib
|
||||
recommend:
|
||||
- HdrHistogram_c
|
||||
- make
|
||||
- cmake
|
||||
- gcc
|
||||
- gcc-c++
|
||||
- rpm-build
|
||||
duration: 15m
|
||||
extra-summary: /tools/HdrHistogram_c/Sanity/sanity-test
|
||||
extra-task: /tools/HdrHistogram_c/Sanity/sanity-test
|
||||
|
|
@ -0,0 +1,89 @@
|
|||
#!/bin/bash
|
||||
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# runtest.sh of /tools/HdrHistogram_c/Sanity/sanity-test
|
||||
# Description: Installs and builds HdrHistogram_c, then runs minimal upstream testsuite.
|
||||
# Author: Jan Kuřík <jkurik@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2020 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="HdrHistogram_c"
|
||||
BUILD_USER=${BUILD_USER:-hdrbuild}
|
||||
|
||||
rlJournalStart
|
||||
rlPhaseStartSetup
|
||||
rlAssertRpm $PACKAGE
|
||||
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
|
||||
rlRun "pushd $TmpDir"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "Get source code and setup build environment"
|
||||
rlFetchSrcForInstalled "${PACKAGE}" \
|
||||
|| rlDie "Can not download SRPM of ${PACKAGE} - giving up"
|
||||
rlRun "yum-builddep -y \
|
||||
$(rpm -q --qf '%{name}-%{version}-%{release}.src.rpm' ${PACKAGE}.$(arch))" \
|
||||
|| rlDie "Can not install build dependencies - giving up"
|
||||
rlRun "useradd -m -N $BUILD_USER" 0,9 && del="yes"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "Build ${PACKAGE}'s upstream testsuite"
|
||||
rlRun "rpm -D \"_topdir ${TmpDir}\" -U \
|
||||
$(rpm -q --qf '%{name}-%{version}-%{release}.src.rpm' ${PACKAGE}.$(arch))"
|
||||
rlRun "chown -R ${BUILD_USER}:users ${TmpDir}"
|
||||
rlRun -s "su -c \
|
||||
'rpmbuild -D \"_topdir ${TmpDir}\" -bc ${TmpDir}/SPECS/${PACKAGE}.spec' \
|
||||
${BUILD_USER}" 0-255
|
||||
rlFileSubmit "${rlRun_LOG}" "rpmbuild-${PACKAGE}.log"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "Run upstream testsuite"
|
||||
BDIR=$(rpm -q --qf '%{name}-%{version}' ${PACKAGE}.$(arch))
|
||||
ARCHDIR="$(arch)-redhat-linux-gnu"
|
||||
if [[ -d "${TmpDir}/BUILD/${BDIR}/${ARCHDIR}" ]]; then
|
||||
# RHEL-9 builds
|
||||
WD="${TmpDir}/BUILD/${BDIR}/${ARCHDIR}/test"
|
||||
else
|
||||
# RHEL-8 builds
|
||||
WD="${TmpDir}/BUILD/${BDIR}/test"
|
||||
fi
|
||||
HDRLIB="$(ls -1 /usr/lib64/libhdr_histogram.so.[0-9]|head -1)"
|
||||
if rlRun "pushd ${WD}"; then
|
||||
rlRun "sed -i \
|
||||
's#\s\S*libhdr_histogram\S*\.a# ${HDRLIB}#g' \
|
||||
\$(find . -name link.txt)"
|
||||
rlRun -s "make clean all test"
|
||||
rlAssertGrep "100% tests passed" "${rlRun_LOG}"
|
||||
rlRun "popd"
|
||||
else
|
||||
rlFail "Error accessing ${WD} directory"
|
||||
fi
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartCleanup
|
||||
[[ "${del}" == "yes" ]] && rlRun "userdel -r ${BUILD_USER}"
|
||||
rlRun "popd"
|
||||
rlRun "rm -r ${TmpDir}" 0 "Removing tmp directory"
|
||||
rlPhaseEnd
|
||||
rlJournalPrintText
|
||||
rlJournalEnd
|
||||
Loading…
Reference in New Issue