[Scummvm-cvs-logs] SF.net SVN: scummvm:[54083] scummvm/trunk/test/module.mk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Nov 5 02:20:53 CET 2010
Revision: 54083
http://scummvm.svn.sourceforge.net/scummvm/?rev=54083&view=rev
Author: fingolfin
Date: 2010-11-05 01:20:53 +0000 (Fri, 05 Nov 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
scummvm/trunk/test/module.mk
Modified: scummvm/trunk/test/module.mk
===================================================================
--- scummvm/trunk/test/module.mk 2010-11-05 01:20:34 UTC (rev 54082)
+++ scummvm/trunk/test/module.mk 2010-11-05 01:20:53 UTC (rev 54083)
@@ -12,6 +12,7 @@
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 @@
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 $@ $+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list