gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [libmicrohttpd] branch master updated (8abd74f3 -> 090ee9e6


From: gnunet
Subject: [GNUnet-SVN] [libmicrohttpd] branch master updated (8abd74f3 -> 090ee9e6)
Date: Thu, 15 Mar 2018 21:21:05 +0100

This is an automated email from the git hooks/post-receive script.

tim-ruehsen pushed a change to branch master
in repository libmicrohttpd.

    from 8abd74f3 add suspend_resume_epoll example (from mailinglist)
     new cb511536 Add MinGW CI build
     new ea4b7cd3 add missing mhd_winsock_inited_ to src/lib/init.c
     new 090ee9e6 Fix race condition in test_get_sendfile/test_get_sendfile11

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitlab-ci.yml                   |  9 +++++++++
 src/lib/init.c                   |  6 ++++++
 src/testcurl/test_get_sendfile.c | 10 ++++++----
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d2d2032..131afe61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,7 @@ after_script:
 variables:
   BUILD_IMAGES_PROJECT: libmicrohttpd/build-images
   DEBIAN_BUILD: buildenv-debian-stretch
+  MINGW_BUILD: buildenv-debian-mingw
   GET_SOURCES_ATTEMPTS: "3"
   CONFIGURE_BASE_FLAGS: --enable-asserts --cache-file cache/config.cache
   CFLAGS_DEFAULT: -O0 -g -ggdb3
@@ -92,3 +93,11 @@ Scan-Build/Debian:
     when: on_failure
     paths:
       - scan-build/*
+
+MinGW/Debian:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW_BUILD
+  script:
+    - export CC="ccache $PREFIX-gcc"
+    - ./bootstrap
+    - ./configure $CONFIGURE_BASE_FLAGS --build=x86_64-pc-linux-gnu 
--host=$PREFIX
+    - make -j$(nproc)
diff --git a/src/lib/init.c b/src/lib/init.c
index 8da693a9..b23bdadf 100644
--- a/src/lib/init.c
+++ b/src/lib/init.c
@@ -41,6 +41,12 @@ MHD_MUTEX_STATIC_DEFN_INIT_(global_init_mutex_);
 
 #endif
 
+#if defined(_WIN32) && ! defined(__CYGWIN__)
+/**
+ * Track initialization of winsock
+ */
+static int mhd_winsock_inited_ = 0;
+#endif
 
 /**
  * Default implementation of the panic function,
diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c
index 6718106d..fb040afe 100644
--- a/src/testcurl/test_get_sendfile.c
+++ b/src/testcurl/test_get_sendfile.c
@@ -576,15 +576,19 @@ main (int argc, char *const *argv)
   FILE *f;
   (void)argc;   /* Unused. Silent compiler warning. */
 
+  oneone = (NULL != strrchr (argv[0], (int) '/')) ?
+    (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0;
+
   if ( (NULL == (tmp = getenv ("TMPDIR"))) &&
        (NULL == (tmp = getenv ("TMP"))) &&
        (NULL == (tmp = getenv ("TEMP"))) )
     tmp = "/tmp";
   sourcefile = malloc (strlen (tmp) + 32);
   sprintf (sourcefile,
-          "%s/%s",
+          "%s/%s%s",
           tmp,
-          "test-mhd-sendfile");
+          "test-mhd-sendfile",
+          oneone ? "11" : "");
   f = fopen (sourcefile, "w");
   if (NULL == f)
     {
@@ -594,8 +598,6 @@ main (int argc, char *const *argv)
     }
   fwrite (TESTSTR, strlen (TESTSTR), 1, f);
   fclose (f);
-  oneone = (NULL != strrchr (argv[0], (int) '/')) ?
-    (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0;
   if (0 != curl_global_init (CURL_GLOBAL_WIN32))
     return 2;
   errorCount += testInternalGet ();

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]