Remove git submodule for testing data

.gitmodules

@@ -1,8 +0,0 @@
-[submodule "testing/data"]
-	path = testing/binaries/data
-	url = https://github.com/MRtrix3/test_data
-	ignore = dirty
-[submodule "testing/script_data"]
-	path = testing/scripts/data
-	url = https://github.com/MRtrix3/script_test_data.git
-	ignore = dirty

testing/CMakeLists.txt

@@ -1,3 +1,48 @@
+if(NOT DEFINED ENV{MRTRIX_BINARIES_DATA_DIR})
+    set(mrtrix_binaries_data_url "https://github.com/mrtrix3/test_data.git")
+else()
+    set(mrtrix_binaries_data_url $ENV{MRTRIX_BINARIES_DATA_DIR})
+    message(STATUS "Using binaries data from $ENV{MRTRIX_BINARIES_DATA_DIR}")
+endif()
+
+if(NOT DEFINED ENV{MRTRIX_SCRIPTS_DATA_DIR})
+    set(mrtrix_scripts_data_url "https://github.com/mrtrix3/script_test_data.git")
+else()
+    set(mrtrix_scripts_data_url $ENV{MRTRIX_SCRIPTS_DATA_DIR})
+    message(STATUS "Using scripts data from $ENV{MRTRIX_SCRIPTS_DATA_DIR}")
+endif()
+
+include(ExternalProject)
+ExternalProject_Add(BinariesTestData
+    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/binaries_data
+    GIT_REPOSITORY ${mrtrix_binaries_data_url}
+    GIT_TAG 2169ebc06040a0b1380017f5f2a11d6380c69922 
+    GIT_PROGRESS TRUE
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    LOG_DOWNLOAD ON
+)
+
+ExternalProject_Add(ScriptsTestData
+    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/scripts_data
+    GIT_REPOSITORY ${mrtrix_scripts_data_url}
+    GIT_TAG 76f47633cd0a37e901c42320f4540ecaffd51367
+    GIT_PROGRESS TRUE
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    LOG_DOWNLOAD ON
+)
+
+set(BINARY_DATA_DIR 
+    ${CMAKE_CURRENT_BINARY_DIR}/binaries_data/src/BinariesTestData
+)
+
+set(SCRIPT_DATA_DIR 
+    ${CMAKE_CURRENT_BINARY_DIR}/scripts_data/src/ScriptsTestData
+)
+
 add_subdirectory(binaries)
 add_subdirectory(lib)
 add_subdirectory(scripts)

testing/binaries/CMakeLists.txt

@@ -1,7 +1,5 @@
 find_program(BASH bash)
 
-set(DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data)
-
 include(DirsToUnix)
 set(EXEC_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 list(APPEND EXEC_DIRS ${PROJECT_BINARY_DIR}/bin)
@@ -23,7 +21,7 @@ function(add_bash_binary_test file_path)
     add_bash_test(
         FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tests/${file_path}"
         PREFIX "${folder_name}"
-        WORKING_DIRECTORY ${DATA_DIR}
+        WORKING_DIRECTORY ${BINARY_DATA_DIR}
         EXEC_DIRECTORIES "${EXEC_DIRS}"
         LABELS "binary;${folder_name};${extra_labels}"
     )

testing/scripts/CMakeLists.txt

@@ -1,7 +1,5 @@
 find_program(BASH bash)
 
-set(DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data)
-
 include(DirsToUnix)
 set(EXEC_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 list(APPEND EXEC_DIRS ${PROJECT_BINARY_DIR}/bin)
@@ -23,7 +21,7 @@ function(add_bash_script_test file_path)
     add_bash_test(
         FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tests/${file_path}"
         PREFIX "${folder_name}"
-        WORKING_DIRECTORY ${DATA_DIR}
+        WORKING_DIRECTORY ${SCRIPT_DATA_DIR}
         EXEC_DIRECTORIES "${EXEC_DIRS}"
         LABELS "script;${folder_name};${extra_labels}"
     )