Browse Source

Unit tests are extra build target

Thomas Buck 10 years ago
parent
commit
c2b0e12694
3 changed files with 16 additions and 10 deletions
  1. 6
    2
      CMakeLists.txt
  2. 3
    1
      README.md
  3. 7
    7
      test/CMakeLists.txt

+ 6
- 2
CMakeLists.txt View File

20
 set (CMAKE_BUILD_TYPE "Debug")
20
 set (CMAKE_BUILD_TYPE "Debug")
21
 
21
 
22
 # Add subdirectories
22
 # Add subdirectories
23
-add_subdirectory ("src")
24
-add_subdirectory ("test")
23
+add_subdirectory (src)
24
+add_subdirectory (test)
25
+
26
+# Add test target
27
+add_custom_target (tests)
28
+add_dependencies (tests GLStringTest MathTest MatrixTest NetworkTest SoundTest TGATest TombRaiderTest)
25
 
29
 
26
 # Preparing the bundle on install
30
 # Preparing the bundle on install
27
 # http://www.cmake.org/Wiki/BundleUtilitiesExample
31
 # http://www.cmake.org/Wiki/BundleUtilitiesExample

+ 3
- 1
README.md View File

65
     make
65
     make
66
     ./src/OpenRaider
66
     ./src/OpenRaider
67
 
67
 
68
-On Mac OS X, running make install will produce a distributable OpenRaider.app bundle.
68
+On Mac OS X, running `make install` will produce a distributable OpenRaider.app bundle.
69
+
70
+To build all Unit Tests, run `make tests`.
69
 
71
 
70
 ## Usage
72
 ## Usage
71
 
73
 

+ 7
- 7
test/CMakeLists.txt View File

23
 
23
 
24
 # TGA Test
24
 # TGA Test
25
 set (TGASRCS "${PROJECT_SOURCE_DIR}/test/tga.cpp" "${PROJECT_SOURCE_DIR}/src/tga.cpp")
25
 set (TGASRCS "${PROJECT_SOURCE_DIR}/test/tga.cpp" "${PROJECT_SOURCE_DIR}/src/tga.cpp")
26
-add_executable (TGATest ${TGASRCS})
26
+add_executable (TGATest EXCLUDE_FROM_ALL ${TGASRCS})
27
 set_target_properties (TGATest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
27
 set_target_properties (TGATest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
28
 
28
 
29
 #################################################################
29
 #################################################################
40
 
40
 
41
 # Sound Test
41
 # Sound Test
42
 set (SOUNDSRCS "${PROJECT_SOURCE_DIR}/test/Sound.cpp" "${PROJECT_SOURCE_DIR}/src/Sound.cpp")
42
 set (SOUNDSRCS "${PROJECT_SOURCE_DIR}/test/Sound.cpp" "${PROJECT_SOURCE_DIR}/src/Sound.cpp")
43
-add_executable (SoundTest ${SOUNDSRCS})
43
+add_executable (SoundTest EXCLUDE_FROM_ALL ${SOUNDSRCS})
44
 set_target_properties (SoundTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
44
 set_target_properties (SoundTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
45
 target_link_libraries (SoundTest ${SOUNDLIBS})
45
 target_link_libraries (SoundTest ${SOUNDLIBS})
46
 
46
 
53
 # Network Test
53
 # Network Test
54
 set (NETWORKSRCS "${PROJECT_SOURCE_DIR}/test/Network.cpp" "${PROJECT_SOURCE_DIR}/src/Network.cpp")
54
 set (NETWORKSRCS "${PROJECT_SOURCE_DIR}/test/Network.cpp" "${PROJECT_SOURCE_DIR}/src/Network.cpp")
55
 set (NETWORKSRCS ${NETWORKSRCS} "${PROJECT_SOURCE_DIR}/src/MatMath.cpp" "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp")
55
 set (NETWORKSRCS ${NETWORKSRCS} "${PROJECT_SOURCE_DIR}/src/MatMath.cpp" "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp")
56
-add_executable (NetworkTest ${NETWORKSRCS})
56
+add_executable (NetworkTest EXCLUDE_FROM_ALL ${NETWORKSRCS})
57
 set_target_properties (NetworkTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
57
 set_target_properties (NetworkTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
58
 target_link_libraries (NetworkTest m ${THREADLIBS})
58
 target_link_libraries (NetworkTest m ${THREADLIBS})
59
 
59
 
61
 
61
 
62
 # Math Test
62
 # Math Test
63
 set (MATHSRCS "${PROJECT_SOURCE_DIR}/test/MatMath.cpp" "${PROJECT_SOURCE_DIR}/src/MatMath.cpp" "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp")
63
 set (MATHSRCS "${PROJECT_SOURCE_DIR}/test/MatMath.cpp" "${PROJECT_SOURCE_DIR}/src/MatMath.cpp" "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp")
64
-add_executable (MathTest ${MATHSRCS})
64
+add_executable (MathTest EXCLUDE_FROM_ALL ${MATHSRCS})
65
 set_target_properties (MathTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
65
 set_target_properties (MathTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
66
 
66
 
67
 #################################################################
67
 #################################################################
70
 set (MATRIXSRCS "${PROJECT_SOURCE_DIR}/test/Matrix.cpp" "${PROJECT_SOURCE_DIR}/src/Matrix.cpp")
70
 set (MATRIXSRCS "${PROJECT_SOURCE_DIR}/test/Matrix.cpp" "${PROJECT_SOURCE_DIR}/src/Matrix.cpp")
71
 set (MATRIXSRCS ${MATRIXSRCS} "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp" "${PROJECT_SOURCE_DIR}/src/MatMath.cpp")
71
 set (MATRIXSRCS ${MATRIXSRCS} "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp" "${PROJECT_SOURCE_DIR}/src/MatMath.cpp")
72
 set (MATRIXSRCS ${MATRIXSRCS} "${PROJECT_SOURCE_DIR}/src/Quaternion.cpp")
72
 set (MATRIXSRCS ${MATRIXSRCS} "${PROJECT_SOURCE_DIR}/src/Quaternion.cpp")
73
-add_executable (MatrixTest ${MATRIXSRCS})
73
+add_executable (MatrixTest EXCLUDE_FROM_ALL ${MATRIXSRCS})
74
 set_target_properties (MatrixTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
74
 set_target_properties (MatrixTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
75
 target_link_libraries (MatrixTest m)
75
 target_link_libraries (MatrixTest m)
76
 
76
 
94
 # GLString Test
94
 # GLString Test
95
 set (GLSTRINGSRCS "${PROJECT_SOURCE_DIR}/test/GLString.cpp" "${PROJECT_SOURCE_DIR}/src/GLString.cpp")
95
 set (GLSTRINGSRCS "${PROJECT_SOURCE_DIR}/test/GLString.cpp" "${PROJECT_SOURCE_DIR}/src/GLString.cpp")
96
 set (GLSTRINGSRCS ${GLSTRINGSRCS} "${PROJECT_SOURCE_DIR}/src/tga.cpp" "${PROJECT_SOURCE_DIR}/src/Texture.cpp")
96
 set (GLSTRINGSRCS ${GLSTRINGSRCS} "${PROJECT_SOURCE_DIR}/src/tga.cpp" "${PROJECT_SOURCE_DIR}/src/Texture.cpp")
97
-add_executable (GLStringTest ${GLSTRINGSRCS})
97
+add_executable (GLStringTest EXCLUDE_FROM_ALL ${GLSTRINGSRCS})
98
 set_target_properties (GLStringTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
98
 set_target_properties (GLStringTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
99
 target_link_libraries (GLStringTest m ${GLLIBS})
99
 target_link_libraries (GLStringTest m ${GLLIBS})
100
 
100
 
109
 set (TOMB_FLAGS "-D__TEST_TR5_DUMP_TGA -D__TEST_32BIT_TEXTILES")
109
 set (TOMB_FLAGS "-D__TEST_TR5_DUMP_TGA -D__TEST_32BIT_TEXTILES")
110
 set (TOMBSRCS "${PROJECT_SOURCE_DIR}/test/TombRaider.cpp" "${PROJECT_SOURCE_DIR}/src/TombRaider.cpp")
110
 set (TOMBSRCS "${PROJECT_SOURCE_DIR}/test/TombRaider.cpp" "${PROJECT_SOURCE_DIR}/src/TombRaider.cpp")
111
 set (TOMBSRCS ${TOMBSRCS} "${PROJECT_SOURCE_DIR}/src/tga.cpp")
111
 set (TOMBSRCS ${TOMBSRCS} "${PROJECT_SOURCE_DIR}/src/tga.cpp")
112
-add_executable (TombRaiderTest ${TOMBSRCS})
112
+add_executable (TombRaiderTest EXCLUDE_FROM_ALL ${TOMBSRCS})
113
 set_target_properties (TombRaiderTest PROPERTIES COMPILE_FLAGS "${OpenRaider_CXX_FLAGS} ${TOMB_FLAGS}")
113
 set_target_properties (TombRaiderTest PROPERTIES COMPILE_FLAGS "${OpenRaider_CXX_FLAGS} ${TOMB_FLAGS}")
114
 target_link_libraries (TombRaiderTest ${ZLIBS})
114
 target_link_libraries (TombRaiderTest ${ZLIBS})
115
 
115
 

Loading…
Cancel
Save