From 11f25148d75dbc67302854b47cb26c8b1b0a553a Mon Sep 17 00:00:00 2001 From: mpech Date: Wed, 29 Jun 2011 13:58:55 +0200 Subject: [PATCH] fetch data pull or clone --- tests/CMakeLists.txt | 3 +-- tests/fetch_data_test.sh | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 04a0b0a..479b144 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_policy(SET CMP0005 NEW) # Data tests path OPTION(CLITK_DATA_PATH ${CMAKE_CURRENT_BINARY_DIR}/data) -ADD_DEFINITIONS(-DCLITK_DATA_PATH=\"${CLITK_DATA_PATH}\") +ADD_DEFINITIONS(-DCLITK_DATA_PATH=\"${CLITK_DATA_PATH}/\") #========================================================= #========================================================= # Get the data tests @@ -18,7 +18,6 @@ EXEC_PROGRAM(${CMAKE_CURRENT_SOURCE_DIR}/fetch_data_test.${scriptExt} ARGS ${CLI #========================================================= # Google test macro macro(ADD_GOOGLE_TESTS executable) -message(exe : ${executable}) foreach ( source ${ARGN} ) file(READ "${source}" contents) string(REGEX MATCHALL "TEST_?F?\\(([A-Za-z_0-9 ,]+)\\)" found_tests ${contents}) diff --git a/tests/fetch_data_test.sh b/tests/fetch_data_test.sh index e31c84f..ce581b6 100755 --- a/tests/fetch_data_test.sh +++ b/tests/fetch_data_test.sh @@ -12,12 +12,12 @@ repo=http://localhost/data/.git if cd $1 then -echo working in `pwd` +git pull else -echo can\'t cd to $1 +git clone $repo $1 exit 1 fi -git clone $server$archive $1 + exit 0 -- 2.47.1