Unverified Commit 8b0b1a30 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

build: get CFLAGS (including -werror) used for examples and tests 

... so that the CI and more detects compiler warnings/errors properly!

Closes #2337
parent 68d84cfe

docs/examples/Makefile.am

+4 −1
Original line number Diff line number Diff line
@@ -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

tests/libtest/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -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)

tests/libtest/lib655.c

+2 −2
Original line number Diff line number Diff line
@@ -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

tests/unit/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -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)

tests/unit/unit1607.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{