Merge branch 'jk/t5561-missing-curl'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2018 04:28:53 +0000 (13:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2018 04:28:53 +0000 (13:28 +0900)
Test fixes.

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

1  2 
t/test-lib.sh
diff --cc t/test-lib.sh
index 483c8d6d7cd9734c04552043b5ff0cb7d1b0af3a,db918752977b80940a7f8fd259c7ae9bc3c072e8..ea2bbaaa7ab4dc77d0ef13cafbe45d1b12bd67e8
@@@ -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
+ '