Changeset 341:2bf23d10bc6f in freeDiameter

Timestamp:

Jun 29, 2010, 11:37:44 AM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Change the test system to use ctest more efficiently

Files:

• CMakeLists.txt (modified) (1 diff)
• INSTALL (modified) (1 diff)
• contrib/debian/rules (modified) (2 diffs)
• freeDiameter/CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -17 +17 @@
 SET(FD_PROJECT_VERSION_API 1)
 
-# Some subfolders may have tests
-ENABLE_TESTING()
-# And actually we are now using CTest advanced features such as CDash, so we need this:
+# The test framework, using CTest and CDash.
 INCLUDE(CTest)
 

INSTALL

@@ -18 +18 @@
 # make
 
-You can enable the unit tests by doing:
-# cmake -DSKIP_TESTS:BOOL=OFF ../
+You can disable the unit tests by doing:
+# cmake -DBUILD_TESTING:BOOL=OFF ../
 # make
 # make tests

contrib/debian/rules

@@ -17 +17 @@
 export DH_OPTIONS
 
-# Uncomment this to run the tests when the package is built
-# compile_the_tests=-DSKIP_TESTS:BOOL=OFF
+# Comment this out if you want to include the tests when the package is built
+skip_the_tests=-DBUILD_TESTING:BOOL=OFF
 
 %:
@@ -24 +24 @@
 
 override_dh_auto_configure:
-        dh_auto_configure -- $(compile_the_tests) \
+        dh_auto_configure -- $(skip_the_tests) \
                 -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
                 -DDEFAULT_CONF_PATH:PATH=/etc/freeDiameter \

freeDiameter/CMakeLists.txt

@@ -76 +76 @@
 
 # The unary tests directory
-OPTION(SKIP_TESTS "Skip compilation of the tests?" ON)
-IF ( NOT SKIP_TESTS )
+IF ( BUILD_TESTING )
         SUBDIRS(tests)
-ENDIF ( NOT SKIP_TESTS )
+ENDIF ( BUILD_TESTING )
 
 ####