just skip entire t5570 due to multiple race conditions

diff --git a/git-core-race_test.patch b/git-core-race_test.patch
deleted file mode 100644 (file)
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 236ee66bb47912b7a1198e0c5b64b9201bf85825..5e8bd145dee8c8a5fb06a63a182239b64fed13ca 100644 (file)
--- 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