From 13b76b20ffb49a1c9f59a792d6230fb7523deaab Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Thu, 5 Apr 2018 12:23:05 +0200
Subject: [PATCH] just skip entire t5570 due to multiple race conditions

---
 git-core-race_test.patch | 22 ----------------------
 git-core.spec            | 10 +++++++---
 2 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 git-core-race_test.patch

diff --git a/git-core-race_test.patch b/git-core-race_test.patch
deleted file mode 100644
index 10e48ae..0000000
--- a/git-core-race_test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- git-2.17.0.orig/t/t5570-git-daemon.sh	2018-04-04 22:46:50.449393002 +0200
-+++ git-2.17.0/t/t5570-git-daemon.sh	2018-04-04 23:34:11.505813150 +0200
-@@ -183,19 +183,6 @@
- 		git ls-remote "$GIT_DAEMON_URL/escape.git"
- '
- 
--test_expect_success 'daemon log records all attributes' '
--	cat >expect <<-\EOF &&
--	Extended attribute "host": localhost
--	Extended attribute "protocol": version=1
--	EOF
--	>daemon.log &&
--	GIT_OVERRIDE_VIRTUAL_HOST=localhost \
--		git -c protocol.version=1 \
--			ls-remote "$GIT_DAEMON_URL/interp.git" &&
--	grep -i extended.attribute daemon.log | cut -d" " -f2- >actual &&
--	test_cmp expect actual
--'
--
- test_expect_success FAKENC 'hostname interpolation works after LF-stripping' '
- 	{
- 		printf "git-upload-pack /interp.git\n\0host=localhost" | packetize
diff --git a/git-core.spec b/git-core.spec
index 236ee66..5e8bd14 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -30,7 +30,6 @@ Source7:	gitolite.pl
 Patch0:		%{name}-key-bindings.patch
 Patch1:		%{name}-sysconfdir.patch
 Patch2:		cherry-picked-commitlog.patch
-Patch3:		%{name}-race_test.patch
 URL:		http://git-scm.com/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -439,7 +438,6 @@ Moduł trzeba zarejestrować poleceniem:
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %{__rm} {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore
 
@@ -479,10 +477,16 @@ echo "BLK_SHA1=1" >> config.mak
 %endif
 
 %if %{with tests}
+# t5770 has multiple race conditions making it very unstable
+GIT_SKIP_TESTS=t5570
 %if %{without tests_cvs}
 %{__rm} t/t*cvs*.sh || :
 %endif
-%{!?with_tests_svn:GIT_SKIP_TESTS='t91??'} %{__make} test
+%if %{without tests_svn}
+GIT_SKIP_TESTS="$GIT_SKIP_TESTS t91??"
+%endif
+export GIT_SKIP_TESTS
+%{__make} test
 %endif
 
 %install
-- 
2.43.0