WIP: Break off CommonTAATDriverBoilerPlate.cmake for reuse (#288)

TriBITSPub · Sep 26, 2017 · 0bda3bd · 0bda3bd
1 parent 20def16
commit 0bda3bd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/test/core/CTestScriptsUnitTests/CMakeLists.txt b/test/core/CTestScriptsUnitTests/CMakeLists.txt
@@ -677,20 +677,19 @@ TRIBITS_ADD_ADVANCED_TEST(
       ${CMAKE_CURRENT_SOURCE_DIR}/TAATDriver/bad_file_name
     ALWAYS_FAIL_ON_NONZERO_RETURN
     PASS_REGULAR_EXPRESSION_ALL
-      "TAAT_Driver_TAAT_COPY_FILES_TO_TEST_DIR_bad_file_name: Added test [(]BASIC, PROCESSORS=1[)]"
+      "TAATDriver_TAAT_COPY_FILES_TO_TEST_DIR_bad_file_name: Added test [(]BASIC, PROCESSORS=1[)]"
       "Generating done"
   TEST_1 CMND make
   TEST_2 CMND ${CMAKE_CTEST_COMMAND} ARGS -VV
     PASS_REGULAR_EXPRESSION_ALL
-      "Error copying file .+/TAATDriver/bad_file_name/this_file_does_not_exist.txt. to .+/TriBITS_CTestScripts_TAAT_COPY_FILES_TO_TEST_DIR_bad_file_name_DRIVER/TAAT_Driver_\
-TAAT_COPY_FILES_TO_TEST_DIR_bad_file_name/"
+      "Error copying file .+/TAATDriver/bad_file_name/this_file_does_not_exist.txt. to .+/TriBITS_CTestScripts_TAAT_COPY_FILES_TO_TEST_DIR_bad_file_name_DRIVER/TAATDriver_TAAT_COPY_FILES_TO_TEST_DIR_bad_file_name/"
       "TEST_0: Result = FAILED"
       "TEST_1: Result = PASSED"
       "This is Test File A"
       "TEST_2: Return code = 0"
       "TEST_2: Pass criteria = Match REGEX .This is Test File A. .PASSED."
       "TEST_2: Result = PASSED"                                
-      "OVERALL FINAL RESULT: TEST FAILED [(]TAAT_Driver_TAAT_COPY_FILES_TO_TEST_DIR_bad_file_name[)]"
+      "OVERALL FINAL RESULT: TEST FAILED [(]TAATDriver_TAAT_COPY_FILES_TO_TEST_DIR_bad_file_name[)]"
   )
   # NOTE: Above is a very strong test.  It actually asserts what is printed by
   # TAAT() tests.  A more targeted test should really be added to do this.

diff --git a/test/core/CTestScriptsUnitTests/TAATDriver/CommonTAATDriverBoilerPlate.cmake b/test/core/CTestScriptsUnitTests/TAATDriver/CommonTAATDriverBoilerPlate.cmake
@@ -0,0 +1,12 @@
+SET(TRIBITS_DIR "" CACHE FILEPATH "Must be set on commandline!")
+
+SET(${PROJECT_NAME}_TRACE_ADD_TEST TRUE)
+SET(${PROJECT_NAME}_TRIBITS_DIR ${TRIBITS_DIR}) 
+SET(PACKAGE_NAME ${PROJECT_NAME})
+SET(${PACKAGE_NAME}_ENABLE_TESTS TRUE)
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+  ${TRIBITS_DIR}/core/utils
+  ${TRIBITS_DIR}/core/package_arch )
+INCLUDE(TribitsAddAdvancedTest)
+INCLUDE(CTest)
+ENABLE_TESTING()
diff --git a/test/core/CTestScriptsUnitTests/TAATDriver/bad_file_name/CMakeLists.txt b/test/core/CTestScriptsUnitTests/TAATDriver/bad_file_name/CMakeLists.txt
@@ -1,17 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-SET(PROJECT_NAME TAAT_Driver)
-
-SET(PACKAGE_NAME ${PROJECT_NAME})
-SET(${PACKAGE_NAME}_ENABLE_TESTS TRUE)
-SET(${PROJECT_NAME}_TRACE_ADD_TEST TRUE)
-SET(${PROJECT_NAME}_TRIBITS_DIR ${TRIBITS_DIR}) 
+SET(PROJECT_NAME TAATDriver)
 PROJECT(${PROJECT_NAME} NONE)
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
-  ${TRIBITS_DIR}/core/utils
-  ${TRIBITS_DIR}/core/package_arch )
-INCLUDE(TribitsAddAdvancedTest)
-INCLUDE(CTest)
-ENABLE_TESTING()
+
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/../CommonTAATDriverBoilerPlate.cmake)
 
 TRIBITS_ADD_ADVANCED_TEST(
   TAAT_COPY_FILES_TO_TEST_DIR_bad_file_name