import fabtests-1.11.1-1.el8

.fabtests.metadata

@@ -1 +1 @@
-c96c10ae2568ea9b92a661e713e587a670e18826 SOURCES/fabtests-1.10.0.tar.bz2
+a6822cd8d6eed21c40be41231e164bab5fe05d35 SOURCES/fabtests-1.11.1.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/fabtests-1.10.0.tar.bz2
+SOURCES/fabtests-1.11.1.tar.bz2

SOURCES/0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch

@@ -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.

SOURCES/0001-adjust-shebang-lines.patch

@@ -0,0 +1,46 @@
+From f9e3ba681b672313c75fd53cec094e5c092fc775 Mon Sep 17 00:00:00 2001
+From: Honggang Li <honli@redhat.com>
+Date: Tue, 17 Nov 2020 15:18:20 +0800
+Subject: [PATCH] adjust shebang lines
+
+Signed-off-by: Honggang Li <honli@redhat.com>
+---
+ 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
+

SOURCES/runfabtests-python3.patch

@@ -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"

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
+Patch0:         0001-adjust-shebang-lines.patch
-Patch1:         runfabtests-python3.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 <honli@redhat.com> - 1.11.1-1
+- Rebase to upstream release v1.11.1
+- Resolves: bz1856274
+
 * Sat Apr 25 2020 Honggang Li <honli@redhat.com> - 1.10.0
 - Rebase to upstream release v1.10.0
 - Resolves: bz1770651