Merge branch origin/release-5-0

[alexxy/gromacs.git] / tests / CMakeLists.txt

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 580ba9bf1f3fa4947f7b4fc44f076f996e99d7b2..021be60c6ef400233385b8b703103fdceb4c8313 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -38,14 +38,14 @@ option(REGRESSIONTEST_DOWNLOAD
     "Automatically download regressiontests. Tests can be run with ctest." OFF)
 
 if(REGRESSIONTEST_DOWNLOAD)
-    if("${PROJECT_VERSION}" MATCHES "-dev")
-      set(REGRESSIONTEST_URL http://gerrit.gromacs.org/snapshot/${REGRESSIONTEST_BRANCH})
-      # REGRESSIONTEST_PATH for dev trees is set later based on the dirname found in the tar
+    if (NOT SOURCE_IS_SOURCE_DISTRIBUTION)
+        set(REGRESSIONTEST_URL http://gerrit.gromacs.org/snapshot/${REGRESSIONTEST_BRANCH})
+        # REGRESSIONTEST_PATH for dev trees is set later based on the dirname found in the tar
     else()
         set(REGRESSIONTEST_URL http://gerrit.gromacs.org/download/regressiontests-${REGRESSIONTEST_VERSION}.tar.gz)
         set(REGRESSIONTEST_PATH
-           "${CMAKE_CURRENT_BINARY_DIR}/regressiontests-${REGRESSIONTEST_VERSION}"
-           CACHE PATH "Path to auto-downloaded regressiontests" FORCE)
+            "${CMAKE_CURRENT_BINARY_DIR}/regressiontests-${REGRESSIONTEST_VERSION}"
+            CACHE PATH "Path to auto-downloaded regressiontests" FORCE)
     endif()
     set(REGRESSIONTEST_FILE "${CMAKE_CURRENT_BINARY_DIR}/regressiontests.tgz")
     message("Downloading: ${REGRESSIONTEST_URL}")
@@ -59,7 +59,7 @@ status_code: ${status_code}
 status_string: ${status_string}
 log: ${log}")
     endif()
-    if(NOT "${PROJECT_VERSION}" MATCHES "-dev")
+    if (SOURCE_IS_SOURCE_DISTRIBUTION)
         file(MD5 ${REGRESSIONTEST_FILE} COMPUTED_MD5SUM)
         if(NOT ${REGRESSIONTEST_MD5SUM} STREQUAL ${COMPUTED_MD5SUM})
             message(FATAL_ERROR "Download of regressiontests failed. Expected MD5 of ${REGRESSIONTEST_MD5SUM} but download has ${COMPUTED_MD5SUM}")
@@ -111,9 +111,9 @@ if(REGRESSIONTEST_PATH)
     if(GMX_DOUBLE)
         list(APPEND ARGS -double)
     endif()
-    if(GMX_LIB_MPI AND NOT MPIEXEC) #autodetection failed or CC=mpicc was used
+    if(GMX_LIB_MPI AND NOT MPIEXEC) # find_program failed
         message(WARNING
-            "Please set MPIEXEC. Otherwise mpirun is assumed for runnings tests.")
+            "Please set MPIEXEC. Otherwise mpirun is assumed for running tests.")
     endif()
     if(GMX_LIB_MPI)
         set(GMX_TEST_NUMBER_PROCS 8 CACHE STRING "Number of processors used for testing")