diff options
| -rw-r--r-- | Makefile | 19 | ||||
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rw-r--r-- | test/README | 5 | ||||
| -rw-r--r-- | test/module.mk | 17 |
4 files changed, 24 insertions, 19 deletions
@@ -68,23 +68,6 @@ deb: debian/prepare fakeroot debian/rules binary -####################################################################### -# Unit/regression tests # -# In order to use 'make test' you have to install cxxtest inside the # -# test/cxxtest dir. Get it from http://cxxtest.sourceforge.net. # -####################################################################### - -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 $@ $+ - - # Special target to create a application wrapper for Mac OS X bundle_name = ScummVM.app @@ -159,4 +142,4 @@ win32dist: scummvm$(EXEEXT) u2d $(WIN32PATH)/*.txt -.PHONY: deb bundle test osxsnap win32dist dist install uninstall +.PHONY: deb bundle osxsnap win32dist dist install uninstall diff --git a/Makefile.common b/Makefile.common index ef442c6cad..9ebf287f1f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -31,7 +31,7 @@ DEPDIR := .deps # Module settings ###################################################################### -MODULES := tools base $(MODULES) +MODULES := test tools base $(MODULES) -include $(srcdir)/engines/module.mk diff --git a/test/README b/test/README new file mode 100644 index 0000000000..eadb0f1080 --- /dev/null +++ b/test/README @@ -0,0 +1,5 @@ +This directory contains some unit tests for ScummVM. They are based on +CxxTest <http://cxxtest.sourceforge.net/>, which you can find in the cxxtest +subdirectory, including its manual. + +To run the unit tests, simply use "make test".
\ No newline at end of file diff --git a/test/module.mk b/test/module.mk new file mode 100644 index 0000000000..f5cd40f117 --- /dev/null +++ b/test/module.mk @@ -0,0 +1,17 @@ +###################################################################### +# Unit/regression tests, based on CxxTest. +# Use the 'test' target to run them. +# Edit 'TESTS' 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 $@ $+ + +.PHONY: test |