ENH: refs #237. Make tests parallel safe

Author: zachmullen

tests/CMakeLists.txt

@@ -1,27 +1,8 @@
 # function to add a new PHP based coverage test to CDash
 #
 function(add_midas_test TestName TestFile)
-  IF(EXISTS ${CMAKE_SOURCE_DIR}/tests/configs/mysql.ini)
-    add_test(
-      Mysql${TestName}
-      ${PHP} ${CMAKE_SOURCE_DIR}/tests/library/PHPUnit/mysqlPhpunit.php --bootstrap ${CMAKE_SOURCE_DIR}/tests/bootstrap.php ${CMAKE_CURRENT_SOURCE_DIR}/${TestFile}
-    )
-    set_tests_properties(
-      Mysql${TestName} PROPERTIES
-      FAIL_REGULAR_EXPRESSION ".*Failures: [1-9]+.*;.*Exceptions: [1-9]+.*"
-    )
-  ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/tests/configs/mysql.ini)
-
-  IF(EXISTS ${CMAKE_SOURCE_DIR}/tests/configs/pgsql.ini)
-    add_test(
-      Pgsql${TestName}
-      ${PHP} ${CMAKE_SOURCE_DIR}/tests/library/PHPUnit/pgsqlPhpunit.php --bootstrap ${CMAKE_SOURCE_DIR}/tests/bootstrap.php ${CMAKE_CURRENT_SOURCE_DIR}/${TestFile}
-    )
-    set_tests_properties(
-      Pgsql${TestName} PROPERTIES
-      FAIL_REGULAR_EXPRESSION ".*Failures: [1-9]+.*;.*Exceptions: [1-9]+.*"
-    )
-  ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/tests/configs/pgsql.ini)
+  add_midas_mysql_test(${TestName} ${TestFile})
+  add_midas_pgsql_test(${TestName} ${TestFile})
 endfunction(add_midas_test)
 
 function(add_midas_mysql_test TestName TestFile)
@@ -33,6 +14,7 @@ function(add_midas_mysql_test TestName TestFile)
     set_tests_properties(
       Mysql${TestName} PROPERTIES
       FAIL_REGULAR_EXPRESSION ".*Failures: [1-9]+.*;.*Exceptions: [1-9]+.*"
+      RESOURCE_LOCK MIDASDatabase
     )
   ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/tests/configs/mysql.ini)  
 endfunction(add_midas_mysql_test)
@@ -46,6 +28,7 @@ function(add_midas_pgsql_test TestName TestFile)
     set_tests_properties(
       Pgsql${TestName} PROPERTIES
       FAIL_REGULAR_EXPRESSION ".*Failures: [1-9]+.*;.*Exceptions: [1-9]+.*"
+      RESOURCE_LOCK MIDASDatabase
     )
   ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/tests/configs/pgsql.ini)
 endfunction(add_midas_pgsql_test)