Fixed up tests to allow grouped targets

3 files changed, 56 insertions, 42 deletions

diff --git a/sigcore/test/CMakeLists.txt b/sigcore/test/CMakeLists.txt
index 29e0cb88..5ab46ed8 100644
--- a/sigcore/test/CMakeLists.txt
+++ b/sigcore/test/CMakeLists.txt
@@ -1,22 +1,23 @@
 SET(libraries
 )
 
-MAKE_TEST(Matrix libraries)
+MAKE_TEST(sigcore-tests libraries Matrix)
 
 SET(libraries
     ${libraries}
     sigcore
 )
 
-MAKE_TEST(Fraction libraries)
-MAKE_TEST(Hat libraries)
-MAKE_TEST(Range libraries)
+MAKE_TEST(sigcore-tests libraries Fraction)
+MAKE_TEST(sigcore-tests libraries Hat)
+MAKE_TEST(sigcore-tests libraries Range)
 
 IF (KDE4_FOUND)
     SET(libraries
         ${libraries}
         ${KDE4_KROSSCORE_LIBRARY}
     )
-    
-    MAKE_TEST(Script libraries)
+    MAKE_TEST(sigcore-tests libraries Script)
 ENDIF (KDE4_FOUND)
+
+MAKE_TEST_GROUP(sigcore sigcore-tests)
diff --git a/sigmod/test/CMakeLists.txt b/sigmod/test/CMakeLists.txt
index 7f951e71..85b0d7b2 100644
--- a/sigmod/test/CMakeLists.txt
+++ b/sigmod/test/CMakeLists.txt
@@ -20,37 +20,39 @@ SET(libraries
     sigmodtest
 )
 
-MAKE_TEST(Ability libraries)
-MAKE_TEST(Author libraries)
-MAKE_TEST(Badge libraries)
-MAKE_TEST(CoinList libraries)
-MAKE_TEST(CoinListItem libraries)
-MAKE_TEST(EggGroup libraries)
-MAKE_TEST(GlobalScript libraries)
-MAKE_TEST(Item libraries)
-MAKE_TEST(ItemType libraries)
-# MAKE_TEST(Map libraries)
-# MAKE_TEST(MapEffect libraries)
-# MAKE_TEST(MapTile libraries)
-# MAKE_TEST(MapTrainer libraries)
-# MAKE_TEST(MapTrainerTeamMember libraries)
-# MAKE_TEST(MapWarp libraries)
-# MAKE_TEST(MapWildList libraries)
-# MAKE_TEST(Move libraries)
-# MAKE_TEST(Nature libraries)
-# MAKE_TEST(Rules libraries)
-# MAKE_TEST(Sigmod libraries)
-# MAKE_TEST(Skin libraries)
-# MAKE_TEST(Sound libraries)
-# MAKE_TEST(Species libraries)
-# MAKE_TEST(SpeciesAbility libraries)
-# MAKE_TEST(SpeciesItem libraries)
-# MAKE_TEST(SpeciesMove libraries)
-# MAKE_TEST(Sprite libraries)
-# MAKE_TEST(Status libraries)
-# MAKE_TEST(Store libraries)
-# MAKE_TEST(Tile libraries)
-# MAKE_TEST(Time libraries)
-# MAKE_TEST(Trainer libraries)
-# MAKE_TEST(Type libraries)
-# MAKE_TEST(Weather libraries)
+MAKE_TEST(sigmod-tests libraries Ability)
+MAKE_TEST(sigmod-tests libraries Author)
+MAKE_TEST(sigmod-tests libraries Badge)
+MAKE_TEST(sigmod-tests libraries CoinList)
+MAKE_TEST(sigmod-tests libraries CoinListItem)
+MAKE_TEST(sigmod-tests libraries EggGroup)
+MAKE_TEST(sigmod-tests libraries GlobalScript)
+MAKE_TEST(sigmod-tests libraries Item)
+MAKE_TEST(sigmod-tests libraries ItemType)
+# MAKE_TEST(sigmod-tests libraries Map)
+# MAKE_TEST(sigmod-tests libraries MapEffect)
+# MAKE_TEST(sigmod-tests libraries MapTile)
+# MAKE_TEST(sigmod-tests libraries MapTrainer)
+# MAKE_TEST(sigmod-tests libraries MapTrainerTeamMember)
+# MAKE_TEST(sigmod-tests libraries MapWarp)
+# MAKE_TEST(sigmod-tests libraries MapWildList)
+# MAKE_TEST(sigmod-tests libraries Move)
+# MAKE_TEST(sigmod-tests libraries Nature)
+# MAKE_TEST(sigmod-tests libraries Rules)
+# MAKE_TEST(sigmod-tests libraries Sigmod)
+# MAKE_TEST(sigmod-tests libraries Skin)
+# MAKE_TEST(sigmod-tests libraries Sound)
+# MAKE_TEST(sigmod-tests libraries Species)
+# MAKE_TEST(sigmod-tests libraries SpeciesAbility)
+# MAKE_TEST(sigmod-tests libraries SpeciesItem)
+# MAKE_TEST(sigmod-tests libraries SpeciesMove)
+# MAKE_TEST(sigmod-tests libraries Sprite)
+# MAKE_TEST(sigmod-tests libraries Status)
+# MAKE_TEST(sigmod-tests libraries Store)
+# MAKE_TEST(sigmod-tests libraries Tile)
+# MAKE_TEST(sigmod-tests libraries Time)
+# MAKE_TEST(sigmod-tests libraries Trainer)
+# MAKE_TEST(sigmod-tests libraries Type)
+# MAKE_TEST(sigmod-tests libraries Weather)
+
+MAKE_TEST_GROUP(sigmod sigmod-tests)
diff --git a/test.cmake b/test.cmake
index 5cbf5563..9b537dfa 100644
--- a/test.cmake
+++ b/test.cmake
@@ -4,7 +4,7 @@ IF (TESTING)
     ENABLE_TESTING()
 ENDIF (TESTING)
 
-MACRO(MAKE_TEST class libraries)
+MACRO (MAKE_TEST variable libraries class)
     KDE4_ADD_UNIT_TEST(test-${class}
         Test${class}.cpp
     )
@@ -13,4 +13,15 @@ MACRO(MAKE_TEST class libraries)
         ${QT_QTTEST_LIBRARY}
         ${${libraries}}
     )
-ENDMACRO(MAKE_TEST)
+    SET(${variable}
+        ${${variable}}
+        test-${class}
+    )
+ENDMACRO (MAKE_TEST)
+
+MACRO (MAKE_TEST_GROUP groupname tests)
+    ADD_CUSTOM_TARGET(${groupname}-tests
+        DEPENDS
+            ${${tests}}
+    )
+ENDMACRO (MAKE_TEST_GROUP)