From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Apr 2018 04:28:53 +0000 (+0900)
Subject: Merge branch 'jk/t5561-missing-curl'
X-Git-Tag: v2.18.0-rc0~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6986abb7726cff889d333ffef4c58176a8db4c1;p=thirdparty%2Fgit.git

Merge branch 'jk/t5561-missing-curl'

Test fixes.

* jk/t5561-missing-curl:
  t5561: skip tests if curl is not available
  t5561: drop curl stderr redirects
---

e6986abb7726cff889d333ffef4c58176a8db4c1
diff --cc t/test-lib.sh
index 483c8d6d7c,db91875297..ea2bbaaa7a
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -1206,5 -1185,9 +1206,9 @@@ test_lazy_prereq LONG_IS_64BIT 
  	test 8 -le "$(build_option sizeof-long)"
  '
  
 -test_lazy_prereq TIME_IS_64BIT 'test-date is64bit'
 -test_lazy_prereq TIME_T_IS_64BIT 'test-date time_t-is64bit'
 +test_lazy_prereq TIME_IS_64BIT 'test-tool date is64bit'
 +test_lazy_prereq TIME_T_IS_64BIT 'test-tool date time_t-is64bit'
+ 
+ test_lazy_prereq CURL '
+ 	curl --version
+ '