[Scummvm-cvs-logs] SF.net SVN: scummvm: [21492] scummvm/trunk/test/module.mk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Mar 29 03:01:17 CEST 2006
Revision: 21492
Author: fingolfin
Date: 2006-03-29 03:00:39 -0800 (Wed, 29 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21492&view=rev
Log Message:
-----------
Improved the 'test' build rule
Modified Paths:
--------------
scummvm/trunk/test/module.mk
Modified: scummvm/trunk/test/module.mk
===================================================================
--- scummvm/trunk/test/module.mk 2006-03-29 10:59:25 UTC (rev 21491)
+++ scummvm/trunk/test/module.mk 2006-03-29 11:00:39 UTC (rev 21492)
@@ -1,17 +1,29 @@
######################################################################
# Unit/regression tests, based on CxxTest.
# Use the 'test' target to run them.
-# Edit 'TESTS' to add more tests.
+# Edit TESTS and TESTLIBS to add more tests.
+#
######################################################################
-CXXTEST := test/cxxtest
-TESTS := test/common/*.h
-CPPFLAGS += -I$(CXXTEST)
-test: runner
- ./runner
-runner: runner.o common/libcommon.a
- $(CXX) -o $@ $+
-runner.cpp: $(TESTS)
- $(CXXTEST)/cxxtestgen.py --error-printer -o $@ $+
+TESTS := test/common/*.h
+TEST_LIBS := common/libcommon.a
+#
+TEST_FLAGS := --runner=StdioPrinter
+TEST_CFLAGS := -Itest/cxxtest
+TEST_LDFLAGS :=
+
+
+# Enable this to get an X11 GUI for the error reporter.
+#TEST_FLAGS += --gui=X11Gui
+#TEST_LDFLAGS += -L/usr/X11R6/lib -lX11
+
+
+test: test/runner
+ ./test/runner
+test/runner: test/runner.cpp $(TEST_LIBS)
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TEST_LDFLAGS) $(TEST_CFLAGS) -o $@ $+
+test/runner.cpp: $(TESTS)
+ test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+
+
.PHONY: test
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