Compare commits

...

No commits in common. "c10s" and "c8" have entirely different histories.
c10s ... c8

9 changed files with 24 additions and 159 deletions

1
.dejagnu.metadata Normal file
View File

@ -0,0 +1 @@
ba903ad48b122a09c5ed2762ac6854ec7f6d3338 SOURCES/dejagnu-1.6.1.tar.gz

View File

@ -1 +0,0 @@
1

10
.gitignore vendored
View File

@ -1,9 +1 @@
dejagnu-1.4.4.tar.gz
dejagnu.texi
/dejagnu-1.5.tar.gz
/dejagnu-1.5.1.tar.gz
/dejagnu-1.5.2.tar.gz
/dejagnu-1.5.3.tar.gz
/dejagnu-1.6.tar.gz
/dejagnu-1.6.1.tar.gz
/dejagnu-1.6.3.tar.gz
SOURCES/dejagnu-1.6.1.tar.gz

View File

@ -1,19 +1,15 @@
Summary: A front end for testing other programs
Name: dejagnu
Version: 1.6.3
Release: 11%{?dist}
Version: 1.6.1
Release: 2%{?dist}
Epoch: 1
License: GPLv3+
Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
Group: Development/Tools
URL: http://www.gnu.org/software/dejagnu/
Requires: expect
BuildArch: noarch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: expect texinfo
BuildRequires: make
Patch0: rhbz460153.patch
BuildRequires: expect screen texinfo
%description
DejaGnu is an Expect/Tcl based framework for testing other programs.
@ -25,22 +21,21 @@ into software development).
%prep
%setup -q
%patch0 -p1
%build
%configure -v
%check
echo ============TESTING===============
# Dejagnu test suite also has to test reporting to user. It needs a
# terminal for that. That doesn't compute in mock. Work around it by
# running the test under screen and communicating back to test runner
# via temporary file. If you have better idea, we accept patches.
TMP=`mktemp`
export SCREENDIR=`mktemp -d`
# Skip selected tests. Failed testcases reported upstream:
# https://lists.gnu.org/archive/html/dejagnu/2021-09/msg00001.html
(make check RUNTESTFLAGS="--ignore pr48155.exp stats.exp"; echo $?) >> $TMP
screen -D -m sh -c '(make check RUNTESTFLAGS="RUNTEST=`pwd`/runtest"; echo $?) >> '$TMP
RESULT=`tail -n 1 $TMP`
cat $TMP
rm -f $TMP
rm -rf $SCREENDIR
echo ============END TESTING===========
exit $RESULT
@ -51,77 +46,28 @@ chmod a-x $RPM_BUILD_ROOT/%{_datadir}/dejagnu/runtest.exp
make DESTDIR=$RPM_BUILD_ROOT install-man
install -D -m 644 doc/dejagnu.info $RPM_BUILD_ROOT/%{_infodir}/%{name}.info
%post
/sbin/install-info %{_infodir}/%{name}.info.gz --dir-file=%{_infodir}/dir &> /dev/null
:
%preun
if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir &> /dev/null
fi
:
%clean
rm -rf $RPM_BUILD_ROOT
%files
%doc COPYING NEWS README AUTHORS ChangeLog doc/dejagnu.texi
%{_bindir}/runtest
%{_bindir}/dejagnu
%{_datadir}/dejagnu
%{_includedir}/dejagnu.h
%{_mandir}/*/*
%{_infodir}/dejagnu*
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:1.6.3-11
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.6.3-10
- Bump release for June 2024 mass rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jan 24 2022 Martin Cermak <mcermak@redhat.com> - 1:1.6.3-4
- Re-fix #460153 using patch from upstream PR53427
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=53427
* Thu Jan 20 2022 Martin Cermak <mcermak@redhat.com> - 1:1.6.3-3
- Fix "perror should not errcnt across test files" (#460153)
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Sep 21 2021 Martin Cermak <mcermak@redhat.com> - 1:1.6.3-1
- Update upstream sources (#1791672)
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jul 24 2018 Matej Mužila <mmuzila@redhat.com> - 1:1.6.1-4
- Fix tests
- Add BuildRequires: gcc-c++
- Resolves: #1603770
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

11
ci.fmf
View File

@ -1,11 +0,0 @@
summary: tier0 test plan
discover:
how: fmf
execute:
how: tmt
prepare+:
- how: shell
script:
- dnf config-manager --set-enabled '*CRB' || true
- dnf config-manager --set-enabled '*crb' || true
- dnf config-manager --set-enabled '*codeready*' || true

View File

@ -1,26 +0,0 @@
--- !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.other.functional}
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-fast-lane.functional}
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.gate-build-slow-lane.functional}
--- !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}

View File

@ -1,31 +0,0 @@
diff --git a/runtest.exp b/runtest.exp
index 01abaf1..55462fe 100644
--- a/runtest.exp
+++ b/runtest.exp
@@ -741,7 +741,7 @@ if { [file tail $srcdir] eq "testsuite" } {
set testsuitedir $base_dir
set testbuilddir $base_dir
} else {
- if { $testsuitedir eq "testsuite" && $srcdir eq "." && $objdir eq "." } {
+ if { $testsuitedir eq "testsuite" && $testbuilddir eq "testsuite" } {
# Broken legacy case -- testsuite not actually in testsuite/
# Produce a warning, but continue.
send_error "WARNING: testsuite is not in a testsuite/ directory.\n"
@@ -1594,7 +1594,7 @@ proc runtest { test_file_name } {
global prms_id
global bug_id
global test_result
- global errcnt
+ global errcnt warncnt
global errorCode
global errorInfo
global tool
@@ -1603,6 +1603,8 @@ proc runtest { test_file_name } {
clone_output "Running $test_file_name ..."
set prms_id 0
set bug_id 0
+ set errcnt 0
+ set warncnt 0
set test_result ""
# set testdir so testsuite file -test has a starting point

View File

@ -1 +0,0 @@
SHA512 (dejagnu-1.6.3.tar.gz) = 1a737132bd912cb527e7f2fcbe70ffff8ccc8604a0ffdecff87ba2a16aeeefd800f5792aeffdbe79be6daa35cedb1c60e41002ca4aabb5370a460028191b76c4

View File

@ -1,4 +0,0 @@
summary: the binary runs and know the --version option
require: dejagnu
test: dejagnu --version
duration: 5m