coreutils
[Top][All Lists]
Advanced

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

[coreutils] [PATCH] tests: do not assume compiler knows -Wxxx flags


From: Paul Eggert
Subject: [coreutils] [PATCH] tests: do not assume compiler knows -Wxxx flags
Date: Wed, 22 Dec 2010 01:50:46 -0800
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7

* gnulib-tests/Makefile.am (test_xvasprintf_CFLAGS):
(test_lock_CFLAGS, test_tls_CFLAGS): Do not append GCC-specific
flags like -Wno-format-security unless the GCC-specific flag
-Werror is also specified.  This avoids a "make check" failure on
Solaris when using Sun C 5.8.
---
 gnulib-tests/Makefile.am |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnulib-tests/Makefile.am b/gnulib-tests/Makefile.am
index 9883a77..311baf9 100644
--- a/gnulib-tests/Makefile.am
+++ b/gnulib-tests/Makefile.am
@@ -3,15 +3,18 @@ include gnulib.mk
 AM_CFLAGS = $(GNULIB_TEST_WARN_CFLAGS) $(WERROR_CFLAGS)
 
 # A few tests are inherently warning-evoking.
-# Since we require -Werror, exempt the few offenders.
+# In the typical case where we use -Werror, exempt the few offenders.
 
 # test-xvasprintf.c: In function 'test_xasprintf':
 # test-xvasprintf.c:100: error: format not a string literal and no \
 #   format arguments [-Wformat-security]
-test_xvasprintf_CFLAGS = $(AM_CFLAGS) -Wno-format-security
+test_xvasprintf_CFLAGS = $(AM_CFLAGS) \
+  `test X$(WERROR_CFLAGS) = X || echo ' -Wno-format-security'`
 
 # test-lock.c: In function 'lock_mutator_thread':
 # test-lock.c:148: error: cast from function call of type 'pthread_t' to \
 #   non-matching type 'void *' [-Wbad-function-cast]
-test_lock_CFLAGS = $(AM_CFLAGS) -Wno-bad-function-cast
-test_tls_CFLAGS = $(AM_CFLAGS) -Wno-bad-function-cast
+test_lock_CFLAGS = $(AM_CFLAGS) \
+  `test X$(WERROR_CFLAGS) = X || echo ' -Wno-bad-function-cast'`
+test_tls_CFLAGS = $(AM_CFLAGS) \
+  `test X$(WERROR_CFLAGS) = X || echo ' -Wno-bad-function-cast'`
-- 
1.7.2




reply via email to

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