fetch data pull or clone

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 04a0b0aa44ff44f5f87be0437f2ffedf49d8bd00..479b144fbe9bf8b86ff6ee7dbcde0a626e8554b5 100644 (file)
--- 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 e31c84fdf00ef5572f6b6c8c2d877b1841e16957..ce581b67187fe1eeb3abe444a94a20ab4f255942 100755 (executable)
--- 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