import fabtests-1.8.0-1.el8

This commit is contained in:
CentOS Sources 2019-11-05 16:27:43 -05:00 committed by Andrew Lukoshko
parent 2aae3fd5c7
commit 61c38ebab8
5 changed files with 41 additions and 31 deletions

View File

@ -1 +1 @@
1500c433b5b6f2b01ca49caf290d0bd48ac2a09e SOURCES/fabtests-1.6.2.tar.bz2 0caddf2362c79fe3e32f6b8da1e39db4277eb2c7 SOURCES/fabtests-1.8.0.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/fabtests-1.6.2.tar.bz2 SOURCES/fabtests-1.8.0.tar.gz

View File

@ -1,36 +1,20 @@
From c97eca499945232f0e6d40b254e64b168261931e Mon Sep 17 00:00:00 2001 diff --git a/fabtests/scripts/rft_yaml_to_junit_xml b/fabtests/scripts/rft_yaml_to_junit_xml
From: Michal Schmidt <mschmidt@redhat.com> index feb646366..2d3b3a30c 100755
Date: Tue, 19 Apr 2016 13:29:43 +0200 --- a/fabtests/scripts/rft_yaml_to_junit_xml
Subject: [PATCH] adjust shebang lines in rft_yaml_to_junit_xml and +++ b/fabtests/scripts/rft_yaml_to_junit_xml
runfabtests.sh
Do not use /usr/bin/env. Call the appropriate binary directly.
This way rpmbuild will record the right dependencies.
---
scripts/rft_yaml_to_junit_xml | 2 +-
scripts/runfabtests.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/rft_yaml_to_junit_xml b/scripts/rft_yaml_to_junit_xml
index feb6463..2d3b3a3 100755
--- a/scripts/rft_yaml_to_junit_xml
+++ b/scripts/rft_yaml_to_junit_xml
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -#!/usr/bin/env ruby
+#!/usr/bin/ruby +#!/usr/bin/ruby
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
# #
diff --git a/scripts/runfabtests.sh b/scripts/runfabtests.sh diff --git a/fabtests/scripts/runfabtests.sh b/fabtests/scripts/runfabtests.sh
index decb11a..8cc02f5 100755 index aba23be6f..73f55d07b 100755
--- a/scripts/runfabtests.sh --- a/fabtests/scripts/runfabtests.sh
+++ b/scripts/runfabtests.sh +++ b/fabtests/scripts/runfabtests.sh
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/env bash -#!/usr/bin/env bash
+#!/bin/bash +#!/bin/bash
# #
# Copyright (c) 2017, Intel Corporation. All rights reserved. # Copyright (c) 2017-2019, Intel Corporation. All rights reserved.
--
2.17.0

View File

@ -0,0 +1,19 @@
diff --git a/fabtests/scripts/runfabtests.sh b/fabtests/scripts/runfabtests.sh
index aba23be6f..70f86a749 100755
--- a/fabtests/scripts/runfabtests.sh
+++ b/fabtests/scripts/runfabtests.sh
@@ -72,11 +72,11 @@ declare -i fail_count=0
declare -i total_failures=0
if [[ "$(uname)" == "FreeBSD" ]]; then
- declare -ri FI_ENODATA=$(python -c 'import errno; print(errno.ENOMSG)')
+ declare -ri FI_ENODATA=$(python3 -c 'import errno; print(errno.ENOMSG)')
else
- declare -ri FI_ENODATA=$(python -c 'import errno; print(errno.ENODATA)')
+ declare -ri FI_ENODATA=$(python3 -c 'import errno; print(errno.ENODATA)')
fi
-declare -ri FI_ENOSYS=$(python -c 'import errno; print(errno.ENOSYS)')
+declare -ri FI_ENOSYS=$(python3 -c 'import errno; print(errno.ENOSYS)')
neg_unit_tests=(
"fi_dgram g00n13s"

View File

@ -1,5 +1,5 @@
Name: fabtests Name: fabtests
Version: 1.6.2 Version: 1.8.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: Test suite for libfabric API Summary: Test suite for libfabric API
# include/jsmn.h and common/jsmn.c are licensed under MIT. # include/jsmn.h and common/jsmn.c are licensed under MIT.
@ -7,9 +7,10 @@ Summary: Test suite for libfabric API
# additionaly expressly allow the option to be licensed under GPLv2. # additionaly expressly allow the option to be licensed under GPLv2.
# See the license headers in individual source files to see which those are. # See the license headers in individual source files to see which those are.
License: BSD and (BSD or GPLv2) and MIT License: BSD and (BSD or GPLv2) and MIT
Url: https://github.com/ofiwg/fabtests Url: https://github.com/ofiwg/libfabric
Source: https://github.com/ofiwg/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 Source: https://github.com/ofiwg/libfabric/releases/download/v%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch Patch0: 0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch
Patch1: runfabtests-python3.patch
BuildRequires: libfabric-devel >= %{version} BuildRequires: libfabric-devel >= %{version}
%ifarch %{valgrind_arches} %ifarch %{valgrind_arches}
BuildRequires: valgrind-devel BuildRequires: valgrind-devel
@ -22,7 +23,8 @@ fabric software library.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p2
%patch1 -p2
%build %build
%configure \ %configure \
@ -40,11 +42,16 @@ rm -f %{buildroot}%{_libdir}/*.la
%files %files
%{_datadir}/%{name}/ %{_datadir}/%{name}/
%{_bindir}/* %{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man7/* %{_mandir}/man7/*
%doc AUTHORS README %doc AUTHORS README
%license COPYING %license COPYING
%changelog %changelog
* Mon Jul 1 2019 Honggang Li <honli@redhat.com> - 1.8.0-1
- Rebase to upstream release v1.8.0
- Resolves: bz1710870
* Mon Dec 10 2018 Honggang Li <honli@redhat.com> - 1.6.2-1 * Mon Dec 10 2018 Honggang Li <honli@redhat.com> - 1.6.2-1
- Rebase to upstream release v1.6.2 - Rebase to upstream release v1.6.2
- Resolves: bz1654871 - Resolves: bz1654871