From bf9beaed43f8772cb5434adb95a47833a05f5a48 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Jan 2020 15:44:08 -0500 Subject: [PATCH] import fabtests-1.9.0rc1-1.el8 --- .fabtests.metadata | 2 +- .gitignore | 2 +- ...ines-in-rft_yaml_to_junit_xml-and-ru.patch | 34 +++++-------------- SOURCES/runfabtests-python3.patch | 19 +++++++++++ SPECS/fabtests.spec | 19 ++++++++--- 5 files changed, 45 insertions(+), 31 deletions(-) create mode 100644 SOURCES/runfabtests-python3.patch diff --git a/.fabtests.metadata b/.fabtests.metadata index e0ce339..f85ab75 100644 --- a/.fabtests.metadata +++ b/.fabtests.metadata @@ -1 +1 @@ -1500c433b5b6f2b01ca49caf290d0bd48ac2a09e SOURCES/fabtests-1.6.2.tar.bz2 +0d968b928074c6e9a578fed5c80c7712d6369371 SOURCES/fabtests-1.9.0rc1.tar.bz2 diff --git a/.gitignore b/.gitignore index a016948..d345a7c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/fabtests-1.6.2.tar.bz2 +SOURCES/fabtests-1.9.0rc1.tar.bz2 diff --git a/SOURCES/0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch b/SOURCES/0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch index b76ad14..2b1ee01 100644 --- a/SOURCES/0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch +++ b/SOURCES/0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch @@ -1,36 +1,20 @@ -From c97eca499945232f0e6d40b254e64b168261931e Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Tue, 19 Apr 2016 13:29:43 +0200 -Subject: [PATCH] adjust shebang lines in rft_yaml_to_junit_xml and - 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 +diff --git a/fabtests/scripts/rft_yaml_to_junit_xml b/fabtests/scripts/rft_yaml_to_junit_xml +index feb646366..2d3b3a30c 100755 +--- a/fabtests/scripts/rft_yaml_to_junit_xml ++++ b/fabtests/scripts/rft_yaml_to_junit_xml @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/usr/bin/ruby # Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. # -diff --git a/scripts/runfabtests.sh b/scripts/runfabtests.sh -index decb11a..8cc02f5 100755 ---- a/scripts/runfabtests.sh -+++ b/scripts/runfabtests.sh +diff --git a/fabtests/scripts/runfabtests.sh b/fabtests/scripts/runfabtests.sh +index aba23be6f..73f55d07b 100755 +--- a/fabtests/scripts/runfabtests.sh ++++ b/fabtests/scripts/runfabtests.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # - # Copyright (c) 2017, Intel Corporation. All rights reserved. --- -2.17.0 - + # Copyright (c) 2017-2019, Intel Corporation. All rights reserved. diff --git a/SOURCES/runfabtests-python3.patch b/SOURCES/runfabtests-python3.patch new file mode 100644 index 0000000..94b622a --- /dev/null +++ b/SOURCES/runfabtests-python3.patch @@ -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" diff --git a/SPECS/fabtests.spec b/SPECS/fabtests.spec index da28747..3a45a4d 100644 --- a/SPECS/fabtests.spec +++ b/SPECS/fabtests.spec @@ -1,5 +1,5 @@ Name: fabtests -Version: 1.6.2 +Version: 1.9.0rc1 Release: 1%{?dist} Summary: Test suite for libfabric API # 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. # See the license headers in individual source files to see which those are. License: BSD and (BSD or GPLv2) and MIT -Url: https://github.com/ofiwg/fabtests -Source: https://github.com/ofiwg/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 +Url: https://github.com/ofiwg/libfabric +Source: https://github.com/ofiwg/libfabric/releases/download/v%{version}/%{name}-%{version}.tar.bz2 Patch0: 0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch +Patch1: runfabtests-python3.patch BuildRequires: libfabric-devel >= %{version} %ifarch %{valgrind_arches} BuildRequires: valgrind-devel @@ -22,7 +23,8 @@ fabric software library. %prep %setup -q -%patch0 -p1 +%patch0 -p2 +%patch1 -p2 %build %configure \ @@ -40,11 +42,20 @@ rm -f %{buildroot}%{_libdir}/*.la %files %{_datadir}/%{name}/ %{_bindir}/* +%{_mandir}/man1/* %{_mandir}/man7/* %doc AUTHORS README %license COPYING %changelog +* Mon Nov 11 2019 Honggang Li - 1.9.0rc1-1 +- Rebase to upstream release v1.9.0rc1 +- Resolves: bz1770650 + +* Mon Jul 1 2019 Honggang Li - 1.8.0-1 +- Rebase to upstream release v1.8.0 +- Resolves: bz1710870 + * Mon Dec 10 2018 Honggang Li - 1.6.2-1 - Rebase to upstream release v1.6.2 - Resolves: bz1654871