From f83bfc0bbf8aa7772efb2b91af24aa6dd5a8df79 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 5 Nov 2010 01:20:53 +0000
Subject: TEST: Tweak "make test" build rules to ignore -Wglobal-constructors

On my OS X machine, -Wglobal-constructors is always added by configure.
But the test runner makes heavy use of global constructors.
This change allows me to run "make test" even when using -Werror.

svn-id: r54083
---
 test/module.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/module.mk b/test/module.mk
index a092bfd7a7..8b74950217 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -12,6 +12,7 @@ TEST_LIBS    := sound/libsound.a common/libcommon.a
 TEST_FLAGS   := --runner=StdioPrinter
 TEST_CFLAGS  := -I$(srcdir)/test/cxxtest
 TEST_LDFLAGS := $(LIBS)
+TEST_CXXFLAGS := $(filter-out -Wglobal-constructors,$(CXXFLAGS))
 
 ifdef HAVE_GCC3
 # In test/common/str.h, we test a zero length format string. This causes GCC
@@ -28,7 +29,7 @@ endif
 test: test/runner
 	./test/runner
 test/runner: test/runner.cpp $(TEST_LIBS)
-	$(QUIET_LINK)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TEST_LDFLAGS) $(TEST_CFLAGS) -o $@ $+
+	$(QUIET_LINK)$(CXX) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_LDFLAGS) $(TEST_CFLAGS) -o $@ $+
 test/runner.cpp: $(TESTS)
 	@mkdir -p test
 	$(srcdir)/test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+
-- 
cgit v1.2.3