From f33be4603f3f37d0759baec333cabc4dc780f898 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 18 Nov 2020 20:10:32 +0000 Subject: [PATCH] import fabtests-1.11.1-1.el8 --- .fabtests.metadata | 2 +- .gitignore | 2 +- ...ines-in-rft_yaml_to_junit_xml-and-ru.patch | 20 -------- SOURCES/0001-adjust-shebang-lines.patch | 46 +++++++++++++++++++ SOURCES/runfabtests-python3.patch | 19 -------- SPECS/fabtests.spec | 10 ++-- 6 files changed, 54 insertions(+), 45 deletions(-) delete mode 100644 SOURCES/0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch create mode 100644 SOURCES/0001-adjust-shebang-lines.patch delete mode 100644 SOURCES/runfabtests-python3.patch diff --git a/.fabtests.metadata b/.fabtests.metadata index 9513851..5ff9982 100644 --- a/.fabtests.metadata +++ b/.fabtests.metadata @@ -1 +1 @@ -c96c10ae2568ea9b92a661e713e587a670e18826 SOURCES/fabtests-1.10.0.tar.bz2 +a6822cd8d6eed21c40be41231e164bab5fe05d35 SOURCES/fabtests-1.11.1.tar.bz2 diff --git a/.gitignore b/.gitignore index 2ef622e..88806a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/fabtests-1.10.0.tar.bz2 +SOURCES/fabtests-1.11.1.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 deleted file mode 100644 index 2b1ee01..0000000 --- a/SOURCES/0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch +++ /dev/null @@ -1,20 +0,0 @@ -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/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-2019, Intel Corporation. All rights reserved. diff --git a/SOURCES/0001-adjust-shebang-lines.patch b/SOURCES/0001-adjust-shebang-lines.patch new file mode 100644 index 0000000..acab856 --- /dev/null +++ b/SOURCES/0001-adjust-shebang-lines.patch @@ -0,0 +1,46 @@ +From f9e3ba681b672313c75fd53cec094e5c092fc775 Mon Sep 17 00:00:00 2001 +From: Honggang Li +Date: Tue, 17 Nov 2020 15:18:20 +0800 +Subject: [PATCH] adjust shebang lines + +Signed-off-by: Honggang Li +--- + fabtests/scripts/parseyaml.py | 2 +- + fabtests/scripts/rft_yaml_to_junit_xml | 2 +- + fabtests/scripts/runfabtests.sh | 2 +- + fabtests/scripts/toCSV.py | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/fabtests/scripts/parseyaml.py b/fabtests/scripts/parseyaml.py +index 757434a0be17..e501c676cbdf 100755 +--- a/fabtests/scripts/parseyaml.py ++++ b/fabtests/scripts/parseyaml.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + + import sys + import pprint +diff --git a/fabtests/scripts/rft_yaml_to_junit_xml b/fabtests/scripts/rft_yaml_to_junit_xml +index feb646366a49..2d3b3a30c48c 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/fabtests/scripts/runfabtests.sh b/fabtests/scripts/runfabtests.sh +index 6f74d53ab926..74743d4e8975 100755 +--- a/fabtests/scripts/runfabtests.sh ++++ b/fabtests/scripts/runfabtests.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # + # Copyright (c) 2017-2019, Intel Corporation. All rights reserved. +-- +2.25.4 + diff --git a/SOURCES/runfabtests-python3.patch b/SOURCES/runfabtests-python3.patch deleted file mode 100644 index 94b622a..0000000 --- a/SOURCES/runfabtests-python3.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 6b4e276..a60e454 100644 --- a/SPECS/fabtests.spec +++ b/SPECS/fabtests.spec @@ -1,5 +1,5 @@ Name: fabtests -Version: 1.10.0 +Version: 1.11.1 Release: 1%{?dist} Summary: Test suite for libfabric API # include/jsmn.h and common/jsmn.c are licensed under MIT. @@ -9,8 +9,7 @@ Summary: Test suite for libfabric API License: BSD and (BSD or GPLv2) and MIT 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 +Patch0: 0001-adjust-shebang-lines.patch BuildRequires: libfabric-devel >= %{version} %ifarch %{valgrind_arches} BuildRequires: valgrind-devel @@ -24,7 +23,6 @@ fabric software library. %prep %setup -q %patch0 -p2 -%patch1 -p2 %build %configure \ @@ -48,6 +46,10 @@ rm -f %{buildroot}%{_libdir}/*.la %license COPYING %changelog +* Tue Nov 17 2020 Honggang Li - 1.11.1-1 +- Rebase to upstream release v1.11.1 +- Resolves: bz1856274 + * Sat Apr 25 2020 Honggang Li - 1.10.0 - Rebase to upstream release v1.10.0 - Resolves: bz1770651