diff --git a/0105-curl-7.27.0-disable-test1112.patch b/0105-curl-7.27.0-disable-test1112.patch deleted file mode 100644 index f6574e5..0000000 --- a/0105-curl-7.27.0-disable-test1112.patch +++ /dev/null @@ -1,30 +0,0 @@ - tests/data/Makefile.am | 2 +- - tests/data/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am -index 9370974..b553f54 100644 ---- a/tests/data/Makefile.am -+++ b/tests/data/Makefile.am -@@ -73,7 +73,7 @@ test1078 test1079 test1080 test1081 test1082 test1083 test1084 test1085 \ - test1086 test1087 test1088 test1089 test1090 test1091 test1092 test1093 \ - test1094 test1095 test1096 test1097 test1098 test1099 test1100 test1101 \ - test1102 test1103 test1104 test1105 test1106 test1107 test1108 test1109 \ --test1110 test1111 test1112 test1113 test1114 test1115 test1116 test1117 \ -+test1110 test1111 test1113 test1114 test1115 test1116 test1117 \ - test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \ - test1126 test1127 test1128 test1129 test1130 test1131 \ - test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ -diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in -index 435b126..1d71c4e 100644 ---- a/tests/data/Makefile.in -+++ b/tests/data/Makefile.in -@@ -338,7 +338,7 @@ test1078 test1079 test1080 test1081 test1082 test1083 test1084 test1085 \ - test1086 test1087 test1088 test1089 test1090 test1091 test1092 test1093 \ - test1094 test1095 test1096 test1097 test1098 test1099 test1100 test1101 \ - test1102 test1103 test1104 test1105 test1106 test1107 test1108 test1109 \ --test1110 test1111 test1112 test1113 test1114 test1115 test1116 test1117 \ -+test1110 test1111 test1113 test1114 test1115 test1116 test1117 \ - test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \ - test1126 test1127 test1128 test1129 test1130 test1131 \ - test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ diff --git a/0109-curl-7.27.0-disable-test1319.patch b/0109-curl-7.27.0-disable-test1319.patch deleted file mode 100644 index fb7c639..0000000 --- a/0109-curl-7.27.0-disable-test1319.patch +++ /dev/null @@ -1,30 +0,0 @@ - tests/data/Makefile.am | 2 +- - tests/data/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am -index bb4722e..d6879c9 100644 ---- a/tests/data/Makefile.am -+++ b/tests/data/Makefile.am -@@ -81,7 +81,7 @@ test1208 test1209 test1210 test1211 \ - test1220 \ - test1300 test1301 test1302 test1303 test1304 test1305 \ - test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \ --test1314 test1315 test1316 test1317 test1318 test1319 test1320 test1321 \ -+test1314 test1315 test1316 test1317 test1318 test1320 test1321 \ - test1322 test1323 test1324 test1325 test1326 test1327 test1328 test1329 \ - test1331 test1332 test1333 test1334 test1335 test1336 test1337 test1338 \ - test1339 test1340 test1341 test1342 test1343 test1344 test1345 test1346 \ -diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in -index c7e9d96..ec70dce 100644 ---- a/tests/data/Makefile.in -+++ b/tests/data/Makefile.in -@@ -346,7 +346,7 @@ test1208 test1209 test1210 test1211 \ - test1220 \ - test1300 test1301 test1302 test1303 test1304 test1305 \ - test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \ --test1314 test1315 test1316 test1317 test1318 test1319 test1320 test1321 \ -+test1314 test1315 test1316 test1317 test1318 test1320 test1321 \ - test1322 test1323 test1324 test1325 test1326 test1327 test1328 test1329 \ - test1331 test1332 test1333 test1334 test1335 test1336 test1337 test1338 \ - test1339 test1340 test1341 test1342 test1343 test1344 test1345 test1346 \ diff --git a/curl.spec b/curl.spec index 10d74d3..53e12bc 100644 --- a/curl.spec +++ b/curl.spec @@ -1,7 +1,7 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl Version: 7.27.0 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma @@ -20,9 +20,6 @@ Patch102: 0102-curl-7.27.0-debug.patch # use localhost6 instead of ip6-localhost in the curl test-suite Patch104: 0104-curl-7.19.7-localhost6.patch -# exclude test1112 from the test suite (#565305) -Patch105: 0105-curl-7.27.0-disable-test1112.patch - # disable valgrind for certain test-cases (libssh2 problem) Patch106: 0106-curl-7.21.0-libssh2-valgrind.patch @@ -33,9 +30,6 @@ Patch107: 0107-curl-7.21.4-libidn-valgrind.patch # a simple iconv can't fix them Patch108: 0108-curl-7.27.0-utf8.patch -# server timeout on ppc64 -Patch109: 0109-curl-7.27.0-disable-test1319.patch - Provides: webclient URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) @@ -119,19 +113,20 @@ documentation of the library, too. %patch106 -p1 %patch107 -p1 %patch108 -p1 -%ifarch ppc64 -%patch109 -p1 -%endif - -# exclude test1112 from the test suite (#565305) -%patch105 -p1 -rm -f tests/data/test1112 # replace hard wired port numbers in the test suite cd tests/data/ sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}9\\1/ test* cd - +# disable test 1112 (#565305) +echo "1112" >> tests/data/DISABLED + +# disable test 1319 on ppc64 (server times out) +%ifarch ppc64 +echo "1319" >> tests/data/DISABLED +%endif + %build [ -x /usr/kerberos/bin/krb5-config ] && KRB5_PREFIX="=/usr/kerberos" %configure --disable-static \ @@ -233,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/libcurl.m4 %changelog +* Mon Aug 06 2012 Kamil Dudka 7.27.0-3 +- use the upstream facility to disable problematic tests + * Wed Aug 01 2012 Kamil Dudka 7.27.0-2 - eliminate unnecessary inotify events on upload via file protocol (#844385)