Accepting request 321837 from devel:libraries:c_c++

1

OBS-URL: https://build.opensuse.org/request/show/321837
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/curl?expand=0&rev=105
This commit is contained in:
Dominique Leuenberger 2015-08-13 16:09:34 +00:00 committed by Git OBS Bridge
commit 7e73bc28f9
3 changed files with 57 additions and 1 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Aug 11 10:02:18 UTC 2015 - schwab@suse.de
- unexpire-test46.patch: Unexpire test 46
-------------------------------------------------------------------
Fri Jul 31 08:22:39 UTC 2015 - normand@linux.vnet.ibm.com
- do not run flaky tests for any architecture (bnc#940009)
at least test 1510 do fail for i586 and ppc64le
-------------------------------------------------------------------
Fri Jul 3 08:29:55 UTC 2015 - vcizek@suse.com

View File

@ -36,6 +36,7 @@ Patch3: curl-secure-getenv.patch
# PATCH-FIX-OPENSUSE lnussel@suse.de -- use openssl's built in verify path as fallback
Patch4: curl-7.41.0-use-openssl-s-built-in-verify-path-as-fallback.diff
Patch5: curl-disable_failing_tests.patch
Patch6: unexpire-test46.patch
BuildRequires: groff
BuildRequires: krb5-mini-devel
BuildRequires: libtool
@ -100,6 +101,7 @@ user interaction or any kind of interactivity.
%patch3
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
# curl complains if macro definition is contained in CFLAGS
@ -149,8 +151,12 @@ fi
if test -z "$BUILD_INCARNATION"; then
BUILD_INCARNATION=0
fi
base=$((8990 + $BUILD_INCARNATION * 20))
perl ./runtests.pl -a -b$base || exit
# bug940009 do not run flaky tests for any architecture
# at least test 1510 do fail for i586 and ppc64le
perl ./runtests.pl -a -b$base '!flaky' || exit
popd
%endif

39
unexpire-test46.patch Normal file
View File

@ -0,0 +1,39 @@
From 002d58f1e8d8e725ba6d676599838983561feff9 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 10 Aug 2015 00:12:12 +0200
Subject: [PATCH] test46: update cookie expire time
... since it went old and thus was expired and caused the test to fail!
---
tests/data/test46 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/data/test46 b/tests/data/test46
index b6f8f83..b6ebe80 100644
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -51,8 +51,8 @@ TZ=GMT
www.fake.come FALSE / FALSE 1022144953 cookiecliente si
www.loser.com FALSE / FALSE 1139150993 UID 99
-%HOSTIP FALSE / FALSE 1439150993 mooo indeed
-#HttpOnly_%HOSTIP FALSE /want FALSE 1439150993 mooo2 indeed2
+%HOSTIP FALSE / FALSE 1739150993 mooo indeed
+#HttpOnly_%HOSTIP FALSE /want FALSE 1739150993 mooo2 indeed2
%HOSTIP FALSE /want FALSE 0 empty
</file>
</client>
@@ -76,8 +76,8 @@ Cookie: empty=; mooo2=indeed2; mooo=indeed
www.fake.come FALSE / FALSE 1022144953 cookiecliente si
www.loser.com FALSE / FALSE 1139150993 UID 99
-%HOSTIP FALSE / FALSE 1439150993 mooo indeed
-#HttpOnly_%HOSTIP FALSE /want FALSE 1439150993 mooo2 indeed2
+%HOSTIP FALSE / FALSE 1739150993 mooo indeed
+#HttpOnly_%HOSTIP FALSE /want FALSE 1739150993 mooo2 indeed2
%HOSTIP FALSE /want FALSE 0 empty
%HOSTIP FALSE / FALSE 2054030187 ckyPersistent permanent
%HOSTIP FALSE / FALSE 0 ckySession temporary
--
2.5.0