New cmake test target: make run_all_tests

This is still experimental and subject to change.

SVN-Revision: 1379

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cce6ea4f9b01285536963d613136c50187f6c31..af16dd533bdb15bb4111bebb4d8761be1ee3f59f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -698,20 +698,10 @@ IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
   ADD_DEFINITIONS(-Wall -Werror)
 ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
 
-DEFINE_PROPERTY(GLOBAL
-                PROPERTY ALL_TESTS
-                BRIEF_DOCS "Test targets to be run by run_all_tests"
-                FULL_DOCS "Test targets to be run by run_all_tests")
+IF(ENABLE_TEST)
+ADD_CUSTOM_TARGET(run_all_tests)
+ENDIF(ENABLE_TEST)
 
 add_subdirectory(libarchive)
 add_subdirectory(tar)
 add_subdirectory(cpio)
-
-# This doesn't quite work and I don't understand why: the dependent
-# tests do get run, but the final invocation of run_all_tests chokes.
-# (At least on FreeBSD; I'll have to test on VS and MinGW and see what
-# happens there.)
-IF(ENABLE_TEST)
-GET_PROPERTY(TESTS GLOBAL PROPERTY ALL_TESTS)
-ADD_CUSTOM_TARGET(run_all_tests DEPENDS ${TESTS})
-ENDIF(ENABLE_TEST)

diff --git a/cpio/test/CMakeLists.txt b/cpio/test/CMakeLists.txt
index 4a0bb4b79fee9b15b494e80184f19b82c6ec28c0..b383e85a633f5dd669c7bede4a9650d433dcfeef 100644 (file)
--- a/cpio/test/CMakeLists.txt
+++ b/cpio/test/CMakeLists.txt
@@ -66,13 +66,9 @@ IF(ENABLE_CPIO AND ENABLE_TEST)
     ENDIF(test MATCHES "^test_[^/]+[.]c$")
   ENDFOREACH(test)
 
-  #
   # Experimental new test handling
-  #
   ADD_CUSTOM_TARGET(run_bsdcpio_test
-       DEPENDS bsdcpio_test bsdcpio
        COMMAND bsdcpio_test -v -p ${BSDCPIO} -r ${CMAKE_CURRENT_SOURCE_DIR})
-
-  SET_PROPERTY(GLOBAL APPEND PROPERTY ALL_TESTS run_bsdcpio_test)
+  ADD_DEPENDENCIES(run_all_tests run_bsdcpio_test)
 ENDIF(ENABLE_CPIO AND ENABLE_TEST)
 

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index 320f3a90c982fa4860067a3b6dac47c8ecfa4ede..14d13e8ec7e8dc02cdb229eef8677e437aee9842 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -132,13 +132,9 @@ IF(ENABLE_TEST)
   ENDFOREACH(test)
 
 
-  #
   # Experimental new test handling
-  #
   ADD_CUSTOM_TARGET(run_libarchive_test
-       DEPENDS libarchive_test
        COMMAND libarchive_test -v -r ${CMAKE_CURRENT_SOURCE_DIR})
-
-  SET_PROPERTY(GLOBAL APPEND PROPERTY ALL_TESTS run_libarchive_test)
+  ADD_DEPENDENCIES(run_all_tests run_libarchive_test)
 ENDIF(ENABLE_TEST)
 

diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
index 24a835b33e84c736d5233c4c6548f23775b28b4e..06f31190153857a49cde96e6dd4567b7c847bbfb 100644 (file)
--- a/tar/test/CMakeLists.txt
+++ b/tar/test/CMakeLists.txt
@@ -53,12 +53,9 @@ IF(ENABLE_TAR AND ENABLE_TEST)
     ENDIF(test MATCHES "^test_[^/]+[.]c$")
   ENDFOREACH(test)
 
-  #
   # Experimental new test handling
-  #
   ADD_CUSTOM_TARGET(run_bsdtar_test
-       DEPENDS bsdtar_test bsdtar
        COMMAND bsdtar_test -v -p ${BSDTAR} -r ${CMAKE_CURRENT_SOURCE_DIR})
+  ADD_DEPENDENCIES(run_all_tests run_bsdtar_test)
 
-  SET_PROPERTY(GLOBAL APPEND PROPERTY ALL_TESTS run_bsdtar_test)
 ENDIF (ENABLE_TAR AND ENABLE_TEST)