aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-02-23 23:35:23 +0100
committerDaniel Stenberg <daniel@haxx.se>2018-03-04 19:46:26 +0100
commit8b0b1a30881590e70082784e16f3c2c66d88b218 (patch)
treece286b6ee193d73373f95d92fd5230fb788529e0
parent68d84cfe984e7d0483fad14fdd7deef4bf67de1b (diff)
build: get CFLAGS (including -werror) used for examples and tests
... so that the CI and more detects compiler warnings/errors properly! Closes #2337
-rw-r--r--docs/examples/Makefile.am5
-rw-r--r--tests/libtest/Makefile.am4
-rw-r--r--tests/libtest/lib655.c4
-rw-r--r--tests/unit/Makefile.am4
-rw-r--r--tests/unit/unit1607.c2
5 files changed, 13 insertions, 6 deletions
diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index afd35c20b..e5ed222ef 100644
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -53,6 +53,9 @@ else
LDADD = $(LIBDIR)/libcurl.la
endif
+# This might hold -Werror
+CFLAGS += @CURL_CFLAG_EXTRAS@
+
# Makefile.inc provides the check_PROGRAMS and COMPLICATED_EXAMPLES defines
include Makefile.inc
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index a4e85ef0c..0b8ebe9a9 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -49,6 +49,8 @@ test1022.pl Makefile.inc notexists.pl CMakeLists.txt mk-lib1521.pl
CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@
+CFLAGS += @CURL_CFLAG_EXTRAS@
+
# Prevent LIBS from being used for all link targets
LIBS = $(BLANK_AT_MAKETIME)
diff --git a/tests/libtest/lib655.c b/tests/libtest/lib655.c
index f87191598..8777b99ed 100644
--- a/tests/libtest/lib655.c
+++ b/tests/libtest/lib655.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -23,7 +23,7 @@
#include "memdebug.h"
-static const char TEST_DATA_STRING[] = "Test data";
+static const char *TEST_DATA_STRING = "Test data";
static int cb_count = 0;
static int
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 61b72c0db..fab82d2b0 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -50,6 +50,8 @@ endif
EXTRA_DIST = Makefile.inc CMakeLists.txt
+CFLAGS += @CURL_CFLAG_EXTRAS@
+
# Prevent LIBS from being used for all link targets
LIBS = $(BLANK_AT_MAKETIME)
diff --git a/tests/unit/unit1607.c b/tests/unit/unit1607.c
index 135030cac..71c59939b 100644
--- a/tests/unit/unit1607.c
+++ b/tests/unit/unit1607.c
@@ -28,7 +28,7 @@
#include "memdebug.h" /* LAST include file */
static struct Curl_easy *easy;
-struct curl_hash *hostcache;
+static struct curl_hash *hostcache;
static void unit_stop(void)
{