summaryrefslogtreecommitdiffstats
path: root/Tests/ExternalProject
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2009-09-03 16:11:14 (GMT)
committerDavid Cole <david.cole@kitware.com>2009-09-03 16:11:14 (GMT)
commit5624be360e555f3a4505f69cae3f582b2e4e835a (patch)
treeec0684ad9fa0fe4e33f769e2119fffc6dfb206e7 /Tests/ExternalProject
parent20713ab89de358540a19cb07b13202d4298fe393 (diff)
downloadCMake-5624be360e555f3a4505f69cae3f582b2e4e835a.zip
CMake-5624be360e555f3a4505f69cae3f582b2e4e835a.tar.gz
CMake-5624be360e555f3a4505f69cae3f582b2e4e835a.tar.bz2
Add test step to ExternalProject builds. Rename SVN_TAG to SVN_REVISION since it is a more accurate name.
Diffstat (limited to 'Tests/ExternalProject')
-rw-r--r--Tests/ExternalProject/CMakeLists.txt17
1 files changed, 13 insertions, 4 deletions
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index 06d0679..e05db19 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -52,7 +52,8 @@ ep_add(${proj}
INSTALL_COMMAND ""
PATCH_COMMAND ""
SVN_REPOSITORY ""
- SVN_TAG ""
+ SVN_REVISION ""
+ TEST_COMMAND ""
URL ""
UPDATE_COMMAND ""
)
@@ -65,9 +66,17 @@ if(can_build_tutorial_step5)
ep_add(${proj}
URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
+ TEST_BEFORE_INSTALL 1
)
ep_get(${proj} install_dir)
set(TutorialStep5_install_dir ${install_dir})
+
+ set(proj TutorialStep5-Local-TestAfterInstall)
+ ep_add(${proj}
+ URL "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR>
+ TEST_AFTER_INSTALL 1
+ )
endif()
@@ -247,7 +256,7 @@ if(do_svn_tests)
set(proj TutorialStep1-SVN-20090626)
ep_add(${proj}
SVN_REPOSITORY "${local_svn_repo_url}"
- SVN_TAG "-r{2009-06-26 16:50:00 +0000}"
+ SVN_REVISION "-r{2009-06-26 16:50:00 +0000}"
UPDATE_COMMAND ""
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
@@ -260,7 +269,7 @@ if(do_svn_tests)
set(proj TutorialStep1-SVN-r2)
ep_add(${proj}
SVN_REPOSITORY "${local_svn_repo_url}"
- SVN_TAG "-r2"
+ SVN_REVISION "-r2"
UPDATE_COMMAND ""
CMAKE_GENERATOR "${CMAKE_GENERATOR}"
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
@@ -268,7 +277,7 @@ if(do_svn_tests)
DEPENDS "SetupLocalSVNRepository"
)
- # Live SVN / trunk (no SVN_TAG):
+ # Live SVN / trunk (no SVN_REVISION):
#
set(proj TutorialStep1-SVN-trunk)
ep_add(${proj}