pool/libmicrohttpd
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- drop test_tls_options if build is in OBS

Browse Source 
libmicrohttpd-drop-test_tls_options.patch

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmicrohttpd?expand=0&rev=21
This commit is contained in:
Michal Vyskocil 2013-06-06 08:16:27 +00:00 committed by Git OBS Bridge
parent a69c1d4557
commit 7a6ad0693d
3 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libmicrohttpd-drop-test_tls_options.patch Normal file
View File

@ -0,0 +1,41 @@
From: Michal Vyskocil <mvyskocil@suse.com>
Subject: Drop test_tls_options
test_tls_options fails in OBS, but not in local build. So lets skip it from OBS
builds.
/usr/bin/make check-TESTS
make[5]: Entering directory `/home/abuild/rpmbuild/BUILD/libmicrohttpd-0.9.27/src/testcurl/https'
curl version: libcurl/7.30.0 OpenSSL/1.0.1e zlib/1.2.8 libidn/1.25 libssh2/1.4.3
The following handshake should fail (and print an error message)...
curl_easy_perform failed: `SSL connect error'
Fatal error in GNU libmicrohttpd daemon.c:2717: Failed to join a thread
/bin/sh: line 5: 15991 Aborted ${dir}$tst
FAIL: test_tls_options
Index: libmicrohttpd-0.9.27/src/testcurl/https/Makefile.am
===================================================================
--- libmicrohttpd-0.9.27.orig/src/testcurl/https/Makefile.am
+++ libmicrohttpd-0.9.27/src/testcurl/https/Makefile.am
@@ -29,7 +29,6 @@ check_PROGRAMS = \
EXTRA_DIST = cert.pem key.pem tls_test_keys.h tls_test_common.h
TESTS = \
- test_tls_options \
test_https_multi_daemon \
test_https_get \
test_https_get_select \
Index: libmicrohttpd-0.9.27/src/testcurl/https/Makefile.in
===================================================================
--- libmicrohttpd-0.9.27.orig/src/testcurl/https/Makefile.in
+++ libmicrohttpd-0.9.27/src/testcurl/https/Makefile.in
@@ -58,7 +58,7 @@ check_PROGRAMS = test_tls_options$(EXEEX
test_https_get_parallel_threads$(EXEEXT) \
test_https_session_info$(EXEEXT) test_https_time_out$(EXEEXT) \
test_empty_response$(EXEEXT)
-TESTS = test_tls_options$(EXEEXT) test_https_multi_daemon$(EXEEXT) \
+TESTS = test_https_multi_daemon$(EXEEXT) \
test_https_get$(EXEEXT) test_https_get_select$(EXEEXT) \
test_https_get_parallel$(EXEEXT) \
test_https_get_parallel_threads$(EXEEXT) \

6
libmicrohttpd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 6 08:15:30 UTC 2013 - mvyskocil@suse.com
- drop test_tls_options if build is in OBS
libmicrohttpd-drop-test_tls_options.patch
-------------------------------------------------------------------
Wed Jun 5 16:42:38 UTC 2013 - jengelh@inai.de

7
libmicrohttpd.spec
View File

@ -30,6 +30,8 @@ Url: http://gnunet.org/libmicrohttpd/
Source0: http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz
Source1: http://ftpmirror.gnu.org/libmicrohttpd/%{name}-%{version}.tar.gz.sig
Source2: libmicrohttpd.keyring
#PATCH-FIX-OPENSUSE: test_tls_options fails when running in OBS, so lets drop that one
Patch0: libmicrohttpd-drop-test_tls_options.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libcurl-devel
BuildRequires: libgcrypt-devel >= 1.2.4
@ -142,6 +144,11 @@ application, check it out.
%endif
%setup -q
#XXX: test fail inside OBS only
%if 0%{?opensuse_bs}
%patch0 -p1
%endif
%build
%configure --disable-static \
--enable-curl