Can run unit tests as build target

CMakeLists.txt

@@ -23,10 +23,6 @@ set (CMAKE_BUILD_TYPE "Debug")
 add_subdirectory (src)
 add_subdirectory (test)
 
-# Add test target
-add_custom_target (tests)
-add_dependencies (tests GLStringTest MathTest MatrixTest NetworkTest SoundTest TGATest TombRaiderTest)
-
 # Preparing the bundle on install
 # http://www.cmake.org/Wiki/BundleUtilitiesExample
 # Why does it even work?

README.md

@@ -67,7 +67,7 @@ Do a standard cmake build and then run the resulting executable:
 
 On Mac OS X, running `make install` will produce a distributable OpenRaider.app bundle.
 
-To build all Unit Tests, run `make tests`.
+To build all Unit Tests, run `make tests`, to run most of them use `make testRun`.
 
 ## Usage
 

test/CMakeLists.txt

@@ -115,6 +115,21 @@ target_link_libraries (TombRaiderTest ${ZLIBS})
 
 #################################################################
 
+# Add test build target
+add_custom_target (tests)
+add_dependencies (tests GLStringTest MathTest MatrixTest NetworkTest SoundTest TGATest TombRaiderTest)
+
+# Add test run target
+add_custom_target (testRun echo "Running Unit Tests..."
+    COMMAND TGATest
+    COMMAND SoundTest
+    COMMAND MatrixTest
+    COMMAND MathTest
+    COMMAND GLStringTest
+)
+add_dependencies (testRun tests)
+
+
 #TEST_MAP_TR5=~/.OpenRaider/paks/tr5/demo.trc
 #TEST_MAP_TR4=~/.OpenRaider/paks/tr4/angkor1.tr4
 #TEST_MAP_TR3=~/.OpenRaider/paks/tr3/scotland.tr2

test/GLString.cpp

@@ -107,7 +107,7 @@ void init_text() {
     gTexture.setFlag(Texture::fUseMipmaps);
     gTexture.setMaxTextureCount(32);
 
-    gTexture.loadFontTTF("../data/test.ttf", 32, 126 - 32);  // ASCII
+    gTexture.loadFontTTF("../../data/test.ttf", 32, 126 - 32);  // ASCII
 
     TEXT->Init(4);
     i = TEXT->glPrintf(50, 50, "OpenRaider GLString");

test/Sound.cpp

@@ -12,7 +12,7 @@
 
 #include "greatest.h"
 
-#define TESTFILE "../data/sample.wav"
+#define TESTFILE "../../data/sample.wav"
 
 Sound sound;
 bool inited = false;

test/tga.cpp

@@ -11,11 +11,11 @@
 
 //! \todo generate list?
 const char *testFiles[] = {
-    "../data/particle.tga",
-    "../data/snow.tga",
-    "../data/snow2.tga",
-    "../data/splash.tga",
-    "../data/white.tga"
+    "../../data/particle.tga",
+    "../../data/snow.tga",
+    "../../data/snow2.tga",
+    "../../data/splash.tga",
+    "../../data/white.tga"
 };
 
 TEST checkFile(FILE *f) {