Compare commits
29 Commits
master
...
main-riscv
Author | SHA1 | Date |
---|---|---|
David Abdurachmanov | 30db9a653f | |
Fedora Release Engineering | 8575fe6860 | |
Jonathan Wakely | dfd3117c8d | |
FeRD (Frank Dana) | 75c399a21e | |
Fedora Release Engineering | 4ea2a1abba | |
Adrian Reber | cdc578d87f | |
Fedora Release Engineering | a7cb5c448d | |
Thomas Rodgers | a9a13dde08 | |
Fedora Release Engineering | 3e7ca679ec | |
Stephen Gallagher | 14cc3a1e1f | |
Jonathan Wakely | abc8f55531 | |
Fedora Release Engineering | 7c1ff35fb2 | |
Adrian Reber | f31ecc60f8 | |
Michal Kolar | 68cf369c87 | |
Adrian Reber | d9d3ca9f7b | |
Jonathan Wakely | b015c2d9e7 | |
Michal Kolar | d14afcb392 | |
Fedora Release Engineering | 828d184134 | |
Troy Dawson | 6163593750 | |
Troy Dawson | f1da17b567 | |
Jonathan Wakely | 2777cf6725 | |
Tom Stellard | 17e2875d2e | |
Keith Seitz | 21dbadd997 | |
Fedora Release Engineering | 43a1e8ca48 | |
Jeff Law | e28e70ae57 | |
Jonathan Wakely | 8492ea50a9 | |
Fedora Release Engineering | b7428b9d21 | |
Orion Poplawski | de02c7eaa4 | |
Orion Poplawski | 9e6b0cc8a0 |
|
@ -0,0 +1 @@
|
||||||
|
1
|
|
@ -8,3 +8,5 @@ source-highlight-3.1.4.tar.gz
|
||||||
/source-highlight-3.1.7.tar.gz.sig
|
/source-highlight-3.1.7.tar.gz.sig
|
||||||
/source-highlight-3.1.8.tar.gz
|
/source-highlight-3.1.8.tar.gz
|
||||||
/source-highlight-3.1.8.tar.gz.sig
|
/source-highlight-3.1.8.tar.gz.sig
|
||||||
|
/source-highlight-3.1.9.tar.gz
|
||||||
|
/source-highlight-3.1.9.tar.gz.sig
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
From 904949c9026cb772dc93fbe0947a252ef47127f4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tom Tromey <tom@tromey.com>
|
||||||
|
Date: Wed, 10 Jun 2020 20:38:27 -0600
|
||||||
|
Subject: Remove "throw" specifications
|
||||||
|
|
||||||
|
C++ throw specifications were deprecated in C++11.
|
||||||
|
This patch removes them from the library.
|
||||||
|
---
|
||||||
|
ChangeLog | 5 +++++
|
||||||
|
lib/srchilite/fileutil.cc | 2 +-
|
||||||
|
lib/srchilite/fileutil.h | 2 +-
|
||||||
|
3 files changed, 7 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/srchilite/fileutil.cc b/lib/srchilite/fileutil.cc
|
||||||
|
index 59a6d64..963178c 100644
|
||||||
|
--- a/lib/srchilite/fileutil.cc
|
||||||
|
+++ b/lib/srchilite/fileutil.cc
|
||||||
|
@@ -48,7 +48,7 @@ void set_file_util_verbose(bool b) {
|
||||||
|
// FIXME avoid using a global variable
|
||||||
|
std::string start_path;
|
||||||
|
|
||||||
|
-string readFile(const string &fileName) throw (IOException) {
|
||||||
|
+string readFile(const string &fileName) {
|
||||||
|
ifstream file(fileName.c_str());
|
||||||
|
|
||||||
|
if (!file.is_open()) {
|
||||||
|
diff --git a/lib/srchilite/fileutil.h b/lib/srchilite/fileutil.h
|
||||||
|
index 7335a9b..042eb56 100644
|
||||||
|
--- a/lib/srchilite/fileutil.h
|
||||||
|
+++ b/lib/srchilite/fileutil.h
|
||||||
|
@@ -27,7 +27,7 @@ extern std::string start_path;
|
||||||
|
* @return the contents of the file
|
||||||
|
* @throw IOException
|
||||||
|
*/
|
||||||
|
-string readFile(const string &fileName) throw (IOException);
|
||||||
|
+string readFile(const string &fileName);
|
||||||
|
|
||||||
|
//char *read_file(const string &fileName);
|
||||||
|
|
||||||
|
--
|
||||||
|
cgit v1.1
|
||||||
|
|
|
@ -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
|
|
@ -1,12 +0,0 @@
|
||||||
diff -up source-highlight-3.1.8/src/esc.style.no-black source-highlight-3.1.8/src/esc.style
|
|
||||||
--- source-highlight-3.1.8/src/esc.style.no-black 2019-03-20 16:52:33.053965325 +0000
|
|
||||||
+++ source-highlight-3.1.8/src/esc.style 2019-03-20 16:52:42.502965289 +0000
|
|
||||||
@@ -7,7 +7,7 @@ comment cyan i ;
|
|
||||||
number purple ;
|
|
||||||
preproc darkblue b ;
|
|
||||||
symbol darkred ;
|
|
||||||
-function black b;
|
|
||||||
+function b;
|
|
||||||
cbracket red;
|
|
||||||
variable darkgreen ;
|
|
||||||
|
|
|
@ -1,17 +1,22 @@
|
||||||
Summary: Produces a document with syntax highlighting
|
Summary: Produces a document with syntax highlighting
|
||||||
Name: source-highlight
|
Name: source-highlight
|
||||||
Version: 3.1.8
|
Version: 3.1.9
|
||||||
Release: 25%{?dist}
|
Release: 19.rvre0%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
|
Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
|
||||||
Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig
|
Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig
|
||||||
# Fix for https://savannah.gnu.org/bugs/index.php?55967
|
|
||||||
Patch: source-highlight-3.1.8-no-black.patch
|
|
||||||
URL: http://www.gnu.org/software/src-highlite/
|
URL: http://www.gnu.org/software/src-highlite/
|
||||||
|
# Taken from https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4
|
||||||
|
# and slightly adapted
|
||||||
|
Patch0: 904949c9026cb772dc93fbe0947a252ef47127f4.patch
|
||||||
|
BuildRequires: make
|
||||||
BuildRequires: bison, flex, boost-devel
|
BuildRequires: bison, flex, boost-devel
|
||||||
BuildRequires: help2man, ctags, chrpath, pkgconfig(bash-completion)
|
BuildRequires: help2man, chrpath, pkgconfig(bash-completion)
|
||||||
BuildRequires: gcc, gcc-c++
|
BuildRequires: gcc, gcc-c++
|
||||||
|
%if 0%{!?rhel:1} || 0%{?rhel} < 9
|
||||||
|
BuildRequires: ctags
|
||||||
Requires: ctags
|
Requires: ctags
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This program, given a source file, produces a document with syntax
|
This program, given a source file, produces a document with syntax
|
||||||
|
@ -34,6 +39,10 @@ Development files for source-highlight
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
|
||||||
|
%if 0%{?rhel} > 8
|
||||||
|
export CTAGS=do_not_use_ctags
|
||||||
|
%endif
|
||||||
%configure --disable-static \
|
%configure --disable-static \
|
||||||
--with-boost-regex=boost_regex
|
--with-boost-regex=boost_regex
|
||||||
%make_build
|
%make_build
|
||||||
|
@ -50,7 +59,11 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
|
||||||
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight
|
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight
|
||||||
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight-settings
|
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight-settings
|
||||||
|
|
||||||
echo -e "\ncxx = cpp.lang" >> $RPM_BUILD_ROOT%{_datadir}/source-highlight/lang.map
|
# Submitted and accepted upstream:
|
||||||
|
# https://savannah.gnu.org/bugs/index.php?63225
|
||||||
|
# This can be removed upon next release after 3.1.9
|
||||||
|
echo -e >> $RPM_BUILD_ROOT%{_datadir}/source-highlight/lang.map \
|
||||||
|
"\nrpm-spec = spec.lang\n"
|
||||||
|
|
||||||
bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
|
bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
|
||||||
mkdir -p $RPM_BUILD_ROOT$bashcompdir
|
mkdir -p $RPM_BUILD_ROOT$bashcompdir
|
||||||
|
@ -81,6 +94,70 @@ rmdir $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
|
||||||
%{_includedir}/srchilite/*.h
|
%{_includedir}/srchilite/*.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 06 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.1.9-19.rvre0
|
||||||
|
- Rebuilt for Fedora/RISCV (riscv64)
|
||||||
|
|
||||||
|
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-19
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-18
|
||||||
|
- Rebuilt for Boost 1.81
|
||||||
|
|
||||||
|
* Sat Oct 15 2022 FeRD (Frank Dana) <ferdnyc@gmail.com> - 3.1.9-17
|
||||||
|
- Stop adding 'cxx' language mapping (fixed upstream)
|
||||||
|
- Add 'rpm-spec' (used in asciidoc) mapping
|
||||||
|
|
||||||
|
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-16
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Oct 06 2022 Adrian Reber <adrian@lisas.de> - 3.1.9-15
|
||||||
|
- Added upstream patch to fix #2131454
|
||||||
|
|
||||||
|
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-14.1
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 3.1.9-13.1
|
||||||
|
- Rebuilt for Boost 1.78
|
||||||
|
|
||||||
|
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-12.1
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Aug 11 2021 Stephen Gallagher <sgallagh@redhat.com> - 3.1.9-11.1
|
||||||
|
- Rebuild for Boost 1.76 in ELN
|
||||||
|
|
||||||
|
* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-11
|
||||||
|
- Rebuilt for Boost 1.76
|
||||||
|
|
||||||
|
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-9
|
||||||
|
- Rebuilt for removed libstdc++ symbol (#1937698)
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-7
|
||||||
|
- Rebuilt for Boost 1.75
|
||||||
|
|
||||||
|
* Wed Jan 6 2021 Keith Seitz <keiths@redhat.com> - 3.1.9-6
|
||||||
|
- Disable ctags support for RHEL9+.
|
||||||
|
|
||||||
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Jeff Law <law@redhat.com> - 3.1.9-4
|
||||||
|
- Force C++14 as this code is not C++17 ready
|
||||||
|
|
||||||
|
* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 3.1.9-3
|
||||||
|
- Rebuilt for Boost 1.73
|
||||||
|
|
||||||
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Oct 12 2019 Orion Poplawski <orion@nwra.com> - 3.1.9-1
|
||||||
|
- Update to 3.1.9
|
||||||
|
|
||||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-25
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-25
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
|
4
sources
4
sources
|
@ -1,2 +1,2 @@
|
||||||
3243470706ef5fefdc3e43b5306a4e41 source-highlight-3.1.8.tar.gz
|
SHA512 (source-highlight-3.1.9.tar.gz) = d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
|
||||||
fec14cd26148f53d05f26b9ecda1fe4c source-highlight-3.1.8.tar.gz.sig
|
SHA512 (source-highlight-3.1.9.tar.gz.sig) = a0bbee3dda6e97fb82c5a455a161030d3b5d053606b0b455de504714a2e2b088af920b86ef340546bdeef79156bedc5e9e4b8911f2c066e0e172eb7dc805b9a6
|
||||||
|
|
|
@ -0,0 +1,63 @@
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# Makefile of /tools/source-highlight/Sanity/source-highlight-testsuite
|
||||||
|
# Description: source-highlight testing by upstream testsuite
|
||||||
|
# Author: Michal Kolar <mkolar@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/source-highlight/Sanity/source-highlight-testsuite
|
||||||
|
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: Michal Kolar <mkolar@redhat.com>" > $(METADATA)
|
||||||
|
@echo "Name: $(TEST)" >> $(METADATA)
|
||||||
|
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||||
|
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||||
|
@echo "Description: source-highlight testing by upstream testsuite" >> $(METADATA)
|
||||||
|
@echo "Type: Sanity" >> $(METADATA)
|
||||||
|
@echo "TestTime: 30m" >> $(METADATA)
|
||||||
|
@echo "RunFor: source-highlight" >> $(METADATA)
|
||||||
|
@echo "Requires: source-highlight rpm-build yum-utils gcc-c++" >> $(METADATA)
|
||||||
|
@echo "Priority: Normal" >> $(METADATA)
|
||||||
|
@echo "License: GPLv2+" >> $(METADATA)
|
||||||
|
@echo "Confidential: no" >> $(METADATA)
|
||||||
|
@echo "Destructive: no" >> $(METADATA)
|
||||||
|
@echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6" >> $(METADATA)
|
||||||
|
|
||||||
|
rhts-lint $(METADATA)
|
|
@ -0,0 +1,3 @@
|
||||||
|
PURPOSE of /tools/source-highlight/Sanity/source-highlight-testsuite
|
||||||
|
Description: source-highlight testing by upstream testsuite
|
||||||
|
Author: Michal Kolar <mkolar@redhat.com>
|
|
@ -0,0 +1,16 @@
|
||||||
|
summary: source-highlight testing by upstream testsuite
|
||||||
|
description: ''
|
||||||
|
contact:
|
||||||
|
- Michal Kolar <mkolar@redhat.com>
|
||||||
|
component:
|
||||||
|
- source-highlight
|
||||||
|
test: ./runtest.sh
|
||||||
|
framework: beakerlib
|
||||||
|
recommend:
|
||||||
|
- source-highlight
|
||||||
|
- rpm-build
|
||||||
|
- yum-utils
|
||||||
|
- gcc-c++
|
||||||
|
duration: 30m
|
||||||
|
extra-summary: /tools/source-highlight/Sanity/source-highlight-testsuite
|
||||||
|
extra-task: /tools/source-highlight/Sanity/source-highlight-testsuite
|
|
@ -0,0 +1,82 @@
|
||||||
|
#!/bin/bash
|
||||||
|
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||||
|
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
#
|
||||||
|
# runtest.sh of /tools/source-highlight/Sanity/source-highlight-testsuite
|
||||||
|
# Description: source-highlight testing by upstream testsuite
|
||||||
|
# Author: Michal Kolar <mkolar@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
|
||||||
|
|
||||||
|
BUILD_USER=${BUILD_USER:-srchghlghtbld}
|
||||||
|
TESTS_COUNT_MIN=${TESTS_COUNT_MIN:-100}
|
||||||
|
PACKAGE="source-highlight"
|
||||||
|
REQUIRES="$PACKAGE rpm-build gcc-c++"
|
||||||
|
if rlIsFedora; then
|
||||||
|
REQUIRES="$REQUIRES dnf-utils"
|
||||||
|
else
|
||||||
|
REQUIRES="$REQUIRES yum-utils"
|
||||||
|
fi
|
||||||
|
|
||||||
|
rlJournalStart
|
||||||
|
rlPhaseStartSetup
|
||||||
|
rlShowRunningKernel
|
||||||
|
rlAssertRpm --all
|
||||||
|
rlRun "TmpDir=\$(mktemp -d)"
|
||||||
|
rlRun "pushd $TmpDir"
|
||||||
|
rlFetchSrcForInstalled $PACKAGE
|
||||||
|
rlRun "useradd -M -N $BUILD_USER" 0,9
|
||||||
|
[ "$?" == "0" ] && rlRun "del=yes"
|
||||||
|
rlRun "chown -R $BUILD_USER:users $TmpDir"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartSetup "build source-highlight"
|
||||||
|
rlRun "rpm -D \"_topdir $TmpDir\" -U *.src.rpm"
|
||||||
|
rlRun "yum-builddep -y $TmpDir/SPECS/*.spec"
|
||||||
|
rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER"
|
||||||
|
rlRun "rlFileSubmit $TmpDir/rpmbuild.log"
|
||||||
|
rlRun "cd $TmpDir/BUILD/source-highlight-*"
|
||||||
|
rlRun "su -c './configure --build=`arch`-redhat-linux-gnu &>$TmpDir/configure.log' $BUILD_USER"
|
||||||
|
rlRun "rlFileSubmit $TmpDir/configure.log"
|
||||||
|
rlRun "cd tests"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest "run testsuite"
|
||||||
|
rlRun "su -c 'make -k PROGEXE=`which source-highlight` check &>$TmpDir/testsuite.log' $BUILD_USER"
|
||||||
|
rlRun "rlFileSubmit $TmpDir/testsuite.log"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest "evaluate results"
|
||||||
|
rlRun "cd $TmpDir"
|
||||||
|
rlRun "grep -E 'Makefile.+Error' testsuite.log" 1
|
||||||
|
rlRun "tests_count=\$(grep -E '^`which source-highlight`' testsuite.log | wc -l)"
|
||||||
|
[ "$tests_count" -ge "$TESTS_COUNT_MIN" ] && rlLogInfo "Test counter: $tests_count" || rlFail "Test counter $tests_count should be greater than or equal to $TESTS_COUNT_MIN"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartCleanup
|
||||||
|
rlRun "popd"
|
||||||
|
rlRun "rm -r $TmpDir"
|
||||||
|
[ "$del" == "yes" ] && rlRun "userdel $BUILD_USER"
|
||||||
|
rlPhaseEnd
|
||||||
|
rlJournalPrintText
|
||||||
|
rlJournalEnd
|
Loading…
Reference in New Issue