[packages/git-core] 1s is not enough on x32 builder, drop problematic test entirely

atler atler at pld-linux.org
Wed Apr 4 23:39:02 CEST 2018


commit a50655ddb2638725c1a80860198d0f50f1564a1f
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Apr 4 23:38:21 2018 +0200

    1s is not enough on x32 builder, drop problematic test entirely

 git-core-race_test.patch | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/git-core-race_test.patch b/git-core-race_test.patch
index 1ff6062..10e48ae 100644
--- a/git-core-race_test.patch
+++ b/git-core-race_test.patch
@@ -1,11 +1,22 @@
-diff -u -r git-2.17.0.orig/t/t5570-git-daemon.sh git-2.17.0/t/t5570-git-daemon.sh
 --- 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 22:47:11.655798538 +0200
-@@ -192,6 +192,7 @@
- 	GIT_OVERRIDE_VIRTUAL_HOST=localhost \
- 		git -c protocol.version=1 \
- 			ls-remote "$GIT_DAEMON_URL/interp.git" &&
-+        sleep 1 &&
- 	grep -i extended.attribute daemon.log | cut -d" " -f2- >actual &&
- 	test_cmp expect actual
++++ 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/a50655ddb2638725c1a80860198d0f50f1564a1f



More information about the pld-cvs-commit mailing list