Merge pull request #400 from bilke/external-data

Executable testing and test data integration

.gitignore

@@ -2,3 +2,4 @@
 build*/
 *.sw[op]
 tags
+.ExternalData_*

.travis.yml

@@ -29,8 +29,9 @@ before_install:
   - travis_retry sudo apt-get install libboost1.55-dev libboost-date-time1.55-dev libboost-filesystem1.55-dev libboost-program-options1.55-dev libboost-system1.55-dev
 
   # CMake
-  - travis_retry wget https://launchpad.net/ubuntu/+source/cmake/2.8.8-2ubuntu1/+build/3441442/+files/cmake_2.8.8-2ubuntu1_amd64.deb; travis_retry wget https://launchpad.net/ubuntu/+archive/primary/+files/cmake-data_2.8.8-2ubuntu1_all.deb
-  - sudo apt-get remove cmake-data cmake; sudo dpkg --install cmake-data_2.8.8-2ubuntu1_all.deb cmake_2.8.8-2ubuntu1_amd64.deb
+  - sudo apt-get remove cmake-data cmake
+  - travis_retry wget http://www.opengeosys.org/images/dev/cmake-2.8.12.2-Linux-x86_64.deb
+  - sudo sudo dpkg --install cmake-2.8.12.2-Linux-x86_64.deb
 
   # Qt and VTK
   - if [[ "$CASE" == "GUI" ]]; then travis_retry sudo apt-get install qt4-dev-tools libshp-dev libgeotiff-dev libxt-dev; fi

CMakeLists.txt

@@ -37,7 +37,9 @@ INCLUDE(scripts/cmake/Find.cmake)
 INCLUDE(scripts/cmake/SubmoduleSetup.cmake)
 INCLUDE(scripts/cmake/ProjectSetup.cmake)
 INCLUDE(scripts/cmake/DocumentationSetup.cmake)
-INCLUDE(scripts/cmake/Test.cmake)
+IF(CMAKE_VERSION VERSION_GREATER 2.8.10)
+	INCLUDE(scripts/cmake/test/Test.cmake)
+ENDIF()
 IF(OGS_COVERAGE AND NOT IS_SUBPROJECT)
 	INCLUDE(scripts/cmake/Coverage.cmake)
 ENDIF()
@@ -148,12 +150,20 @@ IF( OGS_BUILD_CLI )
 	ADD_SUBDIRECTORY( OGS )
 ENDIF() # OGS_BUILD_CLI
 IF( OGS_BUILD_TESTS AND NOT IS_SUBPROJECT )
+	IF(CMAKE_VERSION VERSION_LESS 2.8.11)
+		MESSAGE(FATAL_ERROR "CMAKE 2.8.11 or higher is required to build the tests!")
+	ENDIF()
 	ADD_SUBDIRECTORY( Tests )
-	ADD_SUBDIRECTORY( SimpleTests/MatrixTests )
-	ADD_SUBDIRECTORY( SimpleTests/MeshTests )
+	ADD_SUBDIRECTORY( SimpleTests/MatrixTests EXCLUDE_FROM_ALL )
+	ADD_SUBDIRECTORY( SimpleTests/MeshTests EXCLUDE_FROM_ALL )
 	IF(NOT MSVC AND BLAS_FOUND AND LAPACK_FOUND)
-		ADD_SUBDIRECTORY( SimpleTests/SolverTests )
+		ADD_SUBDIRECTORY( SimpleTests/SolverTests EXCLUDE_FROM_ALL )
 	ENDIF()
+	# Create a target 'data', which downloads all referenced data sets into the build tree
+	# This has to be defined after all tests are defined
+	ExternalData_Add_Target(data)
+	SET_TARGET_PROPERTIES(data PROPERTIES EXCLUDE_FROM_ALL 1)
+	ADD_DEPENDENCIES(ctest data)
 ENDIF() # OGS_BUILD_TESTS
 IF(OGS_BUILD_UTILS AND NOT IS_SUBPROJECT)
 	ADD_SUBDIRECTORY( Utils/SimpleMeshCreation )

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.bc.md5

+6c5a67ef6572bbe5070fc331b1fc9a69

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.cnd.md5

+55bfc26fbcf45b779af3d0d688fb83b9

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gli.md5

+e0e57cd16d19acea8a29d4c964dfb924

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gml.md5

+a054fc73631ae534b814184eb60977c7

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.ic.md5

+28e65510cf287ebd30821075d8e09ca8

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mfp.md5

+29685f8dd61734ead5632b545726758c

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mmp.md5

+5835b975206ba98627a1b6f1dd6be7af

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msh.md5

+e4c0846e14eeeb1807dd5a52bb98a8ea

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msp.md5

+95ebb6b241466ad0b3c73167755a9b3b

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.num.md5

+2116bc15e48e7acabe5ffc3d0c5361fb

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.out.md5

+5964016dd01863a99dac25487287b58a

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pcs.md5

+4eeb3894145d1b4821f23ed9a6d7f238

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pvd.md5

+a74b042e3eccb2d4758068a8c289df14

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.rfd.md5

+95ebb6b241466ad0b3c73167755a9b3b

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.st.md5

+95ebb6b241466ad0b3c73167755a9b3b

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.tim.md5

+d671b92bd9c665a82dc0cdc20da91320

Tests/Data/Elliptic/2d-quads-x1000-y1000/case.vtu.md5

+a615a23368e4cae2d0e794681ba18677