[GNUnet-SVN] r29411 - in libmicrohttpd/src: . testspdy

[gnunet]

Author: andreyu
Date: 2013-09-19 11:52:52 +0200 (Thu, 19 Sep 2013)
New Revision: 29411

Modified:
   libmicrohttpd/src/Makefile.am
   libmicrohttpd/src/testspdy/Makefile.am
   libmicrohttpd/src/testspdy/test_notls.c
Log:
testspdy fixes

Modified: libmicrohttpd/src/Makefile.am
===================================================================
--- libmicrohttpd/src/Makefile.am       2013-09-19 08:59:15 UTC (rev 29410)
+++ libmicrohttpd/src/Makefile.am       2013-09-19 09:52:52 UTC (rev 29411)
@@ -12,11 +12,11 @@
 if HAVE_CURL
 microspdy += spdy2http
 endif
-if HAVE_SPDYLAY
+#if HAVE_SPDYLAY
 microspdy += testspdy
+#endif
 endif
 endif
-endif
 
 SUBDIRS = include microhttpd $(microspdy) examples $(curltests) $(zzuftests) . 
 

Modified: libmicrohttpd/src/testspdy/Makefile.am
===================================================================
--- libmicrohttpd/src/testspdy/Makefile.am      2013-09-19 08:59:15 UTC (rev 
29410)
+++ libmicrohttpd/src/testspdy/Makefile.am      2013-09-19 09:52:52 UTC (rev 
29411)
@@ -21,20 +21,24 @@
 PERF_GET_CONCURRENT=perf_get_concurrent
 endif
 
-if HAVE_SPDYLAY  
-  SPDYLAY_CHECKS = test_new_connection  test_request_response test_notls 
-endif 
 
 check_PROGRAMS = \
        test_daemon_start_stop \
   test_daemon_start_stop_many \
-  test_struct_namevalue \
+  test_struct_namevalue
+
+if HAVE_SPDYLAY  
+  check_PROGRAMS += \
+  test_new_connection  \
+  test_request_response \
+  test_notls \
   test_request_response_with_callback \
-  $(SPDYLAY_CHECKS)
-  #test_requests_with_assets \
   test_misc \
   test_session_timeout
+  #test_requests_with_assets 
+endif 
 
+
 TESTS = $(check_PROGRAMS)
 
 
@@ -81,7 +85,6 @@
  $(SPDY_SOURCES) 
 test_notls_LDADD = $(SPDY_LDADD) \
  -lspdylay
-endif
 
 test_request_response_with_callback_SOURCES = \
  test_request_response_with_callback.c  \
@@ -112,3 +115,5 @@
  $(SPDY_SOURCES) 
 test_proxies_LDADD = $(SPDY_LDADD)
 endif
+
+endif

Modified: libmicrohttpd/src/testspdy/test_notls.c
===================================================================
--- libmicrohttpd/src/testspdy/test_notls.c     2013-09-19 08:59:15 UTC (rev 
29410)
+++ libmicrohttpd/src/testspdy/test_notls.c     2013-09-19 09:52:52 UTC (rev 
29411)
@@ -488,6 +488,7 @@
     }
     close(fd);
     fd = -1;
+    dief("connect", strerror(errno));
   }
   freeaddrinfo(res);
   return fd;
@@ -498,11 +499,11 @@
   int flags, rv;
   while((flags = fcntl(fd, F_GETFL, 0)) == -1 && errno == EINTR);
   if(flags == -1) {
-    dief("fcntl", strerror(errno));
+    dief("fcntl1", strerror(errno));
   }
   while((rv = fcntl(fd, F_SETFL, flags | O_NONBLOCK)) == -1 && errno == EINTR);
   if(rv == -1) {
-    dief("fcntl", strerror(errno));
+    dief("fcntl2", strerror(errno));
   }
 }
 
@@ -843,6 +844,7 @@
   act.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &act, 0);
 
+       usleep(10000);
        asprintf(&uristr, "https://127.0.0.1:%i/",port);
        if(NULL == (rcvbuf = malloc(strlen(RESPONSE_BODY)+1)))
                killparent(parent,"no memory");