Replace Rawhide s390-sleep patch with a more targeted patch adding a delay

after tests 513 and 514 rather than after all tests
This commit is contained in:
Paul Howarth 2010-04-22 15:27:30 +00:00
parent c3d8d1c18b
commit 1105c159cc
2 changed files with 30 additions and 2 deletions

View File

@ -0,0 +1,24 @@
diff -up curl-7.20.1/tests/data/test513.delay curl-7.20.1/tests/data/test513
--- curl-7.20.1/tests/data/test513.delay 2010-04-22 10:00:08.326108258 +0100
+++ curl-7.20.1/tests/data/test513 2010-04-22 11:09:08.342100834 +0100
@@ -17,7 +17,7 @@ lib513
<name>
send HTTP POST using read callback that returns CURL_READFUNC_ABORT
</name>
- <command>
+ <command delay="1">
http://%HOSTIP:%HTTPPORT/513
</command>
</client>
diff -up curl-7.20.1/tests/data/test514.delay curl-7.20.1/tests/data/test514
--- curl-7.20.1/tests/data/test514.delay 2010-04-22 10:00:08.326108258 +0100
+++ curl-7.20.1/tests/data/test514 2010-04-22 11:09:40.192203636 +0100
@@ -29,7 +29,7 @@ lib514
<name>
First set options to POST and then to make HEAD
</name>
- <command>
+ <command delay="1">
http://%HOSTIP:%HTTPPORT/514
</command>
</client>

View File

@ -1,7 +1,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl Name: curl
Version: 7.20.1 Version: 7.20.1
Release: 2%{?dist} Release: 3%{?dist}
License: MIT License: MIT
Group: Applications/Internet Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@ -25,7 +25,7 @@ Patch103: curl-7.19.4-debug.patch
# suppress occasional failure of curl test-suite on s390; caused more likely # suppress occasional failure of curl test-suite on s390; caused more likely
# by the test-suite infrastructure than (lib)curl itself # by the test-suite infrastructure than (lib)curl itself
# http://curl.haxx.se/mail/lib-2009-12/0031.html # http://curl.haxx.se/mail/lib-2009-12/0031.html
Patch104: curl-7.19.7-s390-sleep.patch Patch104: curl-7.20.1-test-delay.patch
# use localhost6 instead of ip6-localhost in the curl test-suite # use localhost6 instead of ip6-localhost in the curl test-suite
Patch105: curl-7.19.7-localhost6.patch Patch105: curl-7.19.7-localhost6.patch
@ -215,6 +215,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4 %{_datadir}/aclocal/libcurl.m4
%changelog %changelog
* Thu Apr 22 2010 Paul Howarth <paul@city-fan.org> 7.20.1-3
- replace Rawhide s390-sleep patch with a more targeted patch adding a
delay after tests 513 and 514 rather than after all tests
* Wed Apr 21 2010 Kamil Dudka <kdudka@redhat.com> 7.20.1-2 * Wed Apr 21 2010 Kamil Dudka <kdudka@redhat.com> 7.20.1-2
- experimentally enabled threaded DNS lookup - experimentally enabled threaded DNS lookup
- make curl-config multilib ready again (#584107) - make curl-config multilib ready again (#584107)