Skip to content

Commit

Permalink
Fix typos, reformat code some, and other cleanup (#278)
Browse files Browse the repository at this point in the history 
Some of these typos were found during the review of trilinos/Trilinos#4438.

I also fixed "PASSSED" with "PASSED" that was grepped for in a bunch of
automated tests.  All good now :-)

Build/Test Cases Summary
Enabled Packages:
Enabled all Packages
0) MPI_DEBUG => passed: passed=341,notpassed=0 (0.86 min)
1) SERIAL_RELEASE => passed: passed=341,notpassed=0 (0.93 min)
  • Loading branch information
@bartlettroscoe
bartlettroscoe committed Feb 22, 2019
1 parent 004d9b3 commit d1f3add
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 98 deletions.
4 changes: 2 additions & 2 deletions test/ctest_driver/MockCTestDriver/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ IF (PYTHON_EXECUTABLE)
"Skipping build because CTEST_DEPENDENCY_HANDLING_UNIT_TESTING='ON'"
"Skipping testing because CTEST_DEPENDENCY_HANDLING_UNIT_TESTING='ON'"
"Done with the all-at-once configure, build, test, ans submit of Trilinos packages"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
)
# NOTE: The above test is for the all-at-once appraoch that checks for the
# ALL_PACKAGES value in failedPackages.txt. That value can be returned from
Expand Down Expand Up @@ -896,7 +896,7 @@ IF (PYTHON_EXECUTABLE)
"Skipping build because CTEST_DEPENDENCY_HANDLING_UNIT_TESTING='ON'"
"Skipping testing because CTEST_DEPENDENCY_HANDLING_UNIT_TESTING='ON'"
"Done with the all-at-once configure, build, test, ans submit of Trilinos packages"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
)
# NOTE: The above test is for the all-at-once appraoch where
# <Project>_ENABLE_ALL_PACKAGES=ON is set (implicitly) but some packages are
Expand Down
16 changes: 10 additions & 6 deletions test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_TribitsExMetaProj_clone_default_branch_re
"WithSubpackages .*=*.* sec[*]proc [(]6 tests[)]"
"WrapExternal .*=*.* sec[*]proc [(]1 test[)]"
"File '' does NOT exist so all tests passed!"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_1
Expand Down Expand Up @@ -216,7 +216,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_TribitsExMetaProj_clone_default_branch_re
"WithSubpackages .*=*.* sec[*]proc [(]6 tests[)]"
"WrapExternal .*=*.* sec[*]proc [(]1 test[)]"
"File '' does NOT exist so all tests passed!"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_6
Expand Down Expand Up @@ -363,7 +363,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_TribitsExMetaProj_clone_custom_branch_rem
"WithSubpackages .*=*.* sec[*]proc [(]6 tests[)]"
"WrapExternal .*=*.* sec[*]proc [(]1 test[)]"
"File '' does NOT exist so all tests passed!"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_1
Expand Down Expand Up @@ -523,17 +523,21 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_TribitsExMetaProj_clone_custom_branch_rem
#


# ToDo: Move the extra repo cloning and updating code into being called by
# cmake -P script unside of CTEST_UPDATE() so that any update failure can be
# reported to CDash! Also, don't do the configure, build, or tests if there
# is an update failure.

# ToDo: Add a test that does a bad clone using a bad repo URL for the base repo

# ToDo: Add a test that does a bad clone using a bad repo URL for the base repo


# ToDo: Add a test that does a bad clone using a bad bad extra repo branch
# (but an okay base repo branch)




# ToDo: Add a test does a bad checkout of a branch that does not exist in an
# extra repo and ensure it reports the update failure.



Expand Down
52 changes: 26 additions & 26 deletions test/ctest_driver/TribitsExampleProject/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_PBP_ST_ALL_PASS
"WrapExternal: Libs build passed"
"WrapExternal: All build passed"
"WrapExternal_run_external_func [.]+ +Passed"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
)
# NOTE: The above test is the basic mode of testing everything and making
Expand Down Expand Up @@ -540,7 +540,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_PBP_ST_ALL_COVERAGE
"Running coverage for package 'MixedLang'"
"Running coverage for package 'WithSubpackages'"
"Running coverage for package 'WrapExternal'"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
)
# NOTE: The above test is the only coverage test for PBP.
Expand Down Expand Up @@ -577,7 +577,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_PBP_ST_ALL_MEMORY
"MemCheck .+: WithSubpackagesA_test_of_a [.]+ +Passed"
"Running memory testing for package 'WrapExternal'"
"MemCheck .+: WrapExternal_run_external_func [.]+ +Passed"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
)
# NOTE: The above test is the only memory test for PBP.
Expand Down Expand Up @@ -624,7 +624,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_PBP_Dashboard_ST_ALL_PASS
"3. Processing current package WrapExternal: libs='ON', tests='ON'"
"Done with the incremental building and testing of TribitsExProj packages"
"TRIBITS_CTEST_DRIVER_ERROR_QUEUE is empty. All is well."
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
"C[)] Clean out the list of packages again to clean the cache file"
"D[)] Reconfigure with the original package list"
ALWAYS_FAIL_ON_NONZERO_RETURN
Expand Down Expand Up @@ -681,7 +681,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_PBP_Dashboard_ST_PackagesSubset_PASS
"1. Processing current package WrapExternal: libs='ON', tests='ON'"
"Done with the incremental building and testing of TribitsExProj packages"
"TRIBITS_CTEST_DRIVER_ERROR_QUEUE is empty. All is well."
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
TEST_2
MESSAGE "Verify that the right set of packages are set"
Expand Down Expand Up @@ -756,7 +756,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_PBP_PT_ALL_PASS_CALLS_2
"WithSubpackages: Libs build passed"
"WithSubpackages: All build passed"
"WithSubpackages: Skipping running tests due to CTEST_DO_TEST='OFF'"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_2
Expand Down Expand Up @@ -793,7 +793,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_PBP_PT_ALL_PASS_CALLS_2
"WithSubpackages: Configure passed!"
"WithSubpackages: Skipping build due to CTEST_DO_BUILD='OFF'"
"WithSubpackages: File '' does NOT exist so all tests passed"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

)
Expand Down Expand Up @@ -840,7 +840,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_PBP_PT_ALL_PASS_CALLS_4
"Calling ctest_start[(]Continuous[)]"
"Run dashboard with model Continuous"
"Skipping processing anything else since not requested to configure, build, test, or run memory tests"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_2
Expand Down Expand Up @@ -878,7 +878,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_PBP_PT_ALL_PASS_CALLS_4
"WithSubpackages: Configure passed!"
"WithSubpackages: Skipping build due to CTEST_DO_BUILD='OFF'"
"WithSubpackages: Skipping running tests due to CTEST_DO_TEST='OFF'"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_3
Expand Down Expand Up @@ -919,7 +919,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_PBP_PT_ALL_PASS_CALLS_4
"WithSubpackages: Libs build passed"
"WithSubpackages: All build passed"
"WithSubpackages: Skipping running tests due to CTEST_DO_TEST='OFF'"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_4
Expand Down Expand Up @@ -956,7 +956,7 @@ TRIBITS_ADD_ADVANCED_TEST( CTestDriver_PBP_PT_ALL_PASS_CALLS_4
"WithSubpackages: Configure passed!"
"WithSubpackages: Skipping build due to CTEST_DO_BUILD='OFF'"
"WithSubpackages: File '' does NOT exist so all tests passed"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

)
Expand Down Expand Up @@ -1034,7 +1034,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"Skipping converage tests because CTEST_DO_COVERAGE_TESTING='FALSE'"
"Skipping memory testing because CTEST_DO_MEMORY_TESTING='FALSE'"
"File '' does NOT exist so all tests passed"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
)
# NOTE: The above test is the basic mode of testing all packages and making
Expand Down Expand Up @@ -1082,7 +1082,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"SimpleCxx_HelloWorldTests [.]+ +Passed"
"SimpleCxx_HelloWorldProg [.]+ +Passed"
"File '' does NOT exist so all tests passed"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
#TEST_2
# MESSAGE "Make sure the Note.xml file contains the right contents"
Expand Down Expand Up @@ -1148,7 +1148,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"SimpleCxx_HelloWorldProg [.]+ +Passed"
"WrapExternal_run_external_func [.]+ +Passed"
"File '' does NOT exist so all tests passed"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
)
# NOTE: The above test makes sure that requesting a subset of packages build
Expand Down Expand Up @@ -1446,7 +1446,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"Percentage Coverage:" # printed by ctest_coverage()
"Done with the all-at-once configure, build, test, ans submit of TribitsExProj packages"
"TRIBITS_CTEST_DRIVER_ERROR_QUEUE is empty. All is well."
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
)
# NOTE: The above test is the only coverage test for AAO mode!
Expand Down Expand Up @@ -1482,7 +1482,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"MemCheck .+: WrapExternal_run_external_func [.]+ +Passed"
"Done with the all-at-once configure, build, test, ans submit of TribitsExProj packages"
"TRIBITS_CTEST_DRIVER_ERROR_QUEUE is empty. All is well."
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
)
# NOTE: The above test is the only memory test for AAO mode!
Expand Down Expand Up @@ -1519,7 +1519,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"Final set of packages to be explicitly processed by CTest/CDash: SimpleCxx MixedLang WithSubpackages WrapExternal 4"
"Configure, build, test and submit results all-at-once for all enabled packages"
"CTEST_LABELS_FOR_SUBPROJECTS='SimpleCxx[;]MixedLang[;]WithSubpackages[;]WrapExternal'"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
TEST_2
MESSAGE "Verify that the right set of packages are set"
Expand Down Expand Up @@ -1563,7 +1563,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"Final set of packages to be explicitly processed by CTest/CDash: SimpleCxx 1"
"CTEST_LABELS_FOR_SUBPROJECTS='SimpleCxx'"
"TRIBITS_CTEST_DRIVER_ERROR_QUEUE is empty. All is well."
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
TEST_2
MESSAGE "Verify that the right set of packages are set"
Expand Down Expand Up @@ -1616,7 +1616,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"Final set of packages to be explicitly processed by CTest/CDash: SimpleCxx WrapExternal 2"
"CTEST_LABELS_FOR_SUBPROJECTS='SimpleCxx[;]WrapExternal'"
"TRIBITS_CTEST_DRIVER_ERROR_QUEUE is empty. All is well."
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
TEST_2
MESSAGE "Verify that the right set of packages are set"
Expand Down Expand Up @@ -1678,7 +1678,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"Skipping tests because CTEST_DO_TEST='OFF'"
"Skipping converage tests because CTEST_DO_COVERAGE_TESTING='FALSE'"
"Skipping memory testing because CTEST_DO_MEMORY_TESTING='FALSE'"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_2
Expand Down Expand Up @@ -1714,7 +1714,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"File '' does NOT exist so all tests passed"
"Skipping converage tests because CTEST_DO_COVERAGE_TESTING='FALSE'"
"Skipping memory testing because CTEST_DO_MEMORY_TESTING='FALSE'"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

)
Expand Down Expand Up @@ -1754,7 +1754,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"Calling ctest_start[(]Continuous[)]"
"Run dashboard with model Continuous"
"Skipping processing anything else since not requested to configure, build, test, or run memory tests"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_2
Expand All @@ -1780,7 +1780,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"Configure PASSED"
"Skipping build due to CTEST_DO_BUILD='OFF'"
"Skipping tests because CTEST_DO_TEST='OFF'"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_3
Expand All @@ -1807,7 +1807,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"Building all targets"
"Build PASSED"
"Skipping tests because CTEST_DO_TEST='OFF'"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_4
Expand All @@ -1833,7 +1833,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"Skipping configure due to CTEST_DO_CONFIGURE='OFF'"
"Skipping build due to CTEST_DO_BUILD='OFF'"
"File '' does NOT exist so all tests passed"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN

)
Expand Down Expand Up @@ -1876,7 +1876,7 @@ FUNCTION(GENERATE_AAO_TESTS USE_NEW_AAO_CTEST_CDASH_FEATURES)
"Build install output: BUILD_INSTALL_NUM_ERRORS='0',BUILD_INSTALL_RETURN_VAL='0'"
"Install PASSED!"
"File '' does NOT exist so all tests passed!"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
TEST_2
MESSAGE "Run the installed simplecxx-helloworld program."
Expand Down
25 changes: 13 additions & 12 deletions tribits/ctest_driver/TribitsCTestDriverCore.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@
# ************************************************************************
# @HEADER

#############################################
#
# Tribits platform-independent test driver.
#
# TriBITS platform-independent test driver.
#
#############################################

MESSAGE("")
MESSAGE("*******************************")
Expand Down Expand Up @@ -595,7 +596,7 @@ INCLUDE(${CMAKE_CURRENT_LIST_DIR}/TribitsCTestDriverCoreHelpers.cmake)
#
# .. _${PROJECT_NAME}_EXCLUDE_PACKAGES:
#
# ``${PROJECT_NAME}_EXCLUDE_PACKAGES=<pkg0>,<pgk1>,...``
# ``${PROJECT_NAME}_EXCLUDE_PACKAGES=<pkg0>,<pkg1>,...``
#
# A semi-colon ';' or comma ',' separated list of packages **NOT** to
# enable when determining the set of packages to be tested. NOTE: Listing
Expand Down Expand Up @@ -1018,9 +1019,9 @@ INCLUDE(${CMAKE_CURRENT_LIST_DIR}/TribitsCTestDriverCoreHelpers.cmake)
#
# ``CTEST_NOTES_FILES="<filepath1>;<filepath2>;..."``
#
# Built-in CTest variable that specifies a semi-colon seprated list of
# Built-in CTest variable that specifies a semi-colon separated list of
# files that will get uploaded to CDash as "notes files". This function
# will also add other files as notes files as well such as the file
# will also add notes files as well such as the file
# ``CMakeCache.clean.txt`` (cleaned-up version of the CMakeCache.txt
# file), the file ``Updates.txt`` (lists new git commits pulled in all the
# git repos), the file ``UpdateCommandsOutput.txt`` (list of commands and
Expand Down Expand Up @@ -1451,7 +1452,7 @@ FUNCTION(TRIBITS_CTEST_DRIVER)
# The name of the site in the dashboard (almost never need to override this)
SET_DEFAULT_AND_FROM_ENV( CTEST_SITE ${CTEST_SITE_DEFAULT} )

# The root of the dasbhoard where ${PROJECT_NAME} will be cloned and the
# The root of the dashboard where ${PROJECT_NAME} will be cloned and the
# BUILD directory will be create (only override for separate testing)
SET_DEFAULT_AND_FROM_ENV( CTEST_DASHBOARD_ROOT "" )
IF (CTEST_DASHBOARD_ROOT STREQUAL "PWD")
Expand Down Expand Up @@ -1515,7 +1516,7 @@ FUNCTION(TRIBITS_CTEST_DRIVER)
# Call CTEST_CONFIGURE(...) or not
SET_DEFAULT_AND_FROM_ENV( CTEST_DO_CONFIGURE TRUE )

# Flags passed to 'make' assume gnumake with unix makefiles
# Flags passed to 'make'
IF("${CTEST_CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
SET_DEFAULT_AND_FROM_ENV( CTEST_BUILD_FLAGS "-j2")
ELSE()
Expand Down Expand Up @@ -2120,7 +2121,7 @@ FUNCTION(TRIBITS_CTEST_DRIVER)
)

# Set up a list of notes files that don't include the CMakeCache.clean.txt
# file which will change for every submit in the package-by-package modee.
# file which will change for every submit in the package-by-package mode.

SET(CTEST_NOTES_FILES_WO_CACHE)

Expand Down Expand Up @@ -2187,7 +2188,7 @@ FUNCTION(TRIBITS_CTEST_DRIVER)

ELSE()

TRIBITS_CTEST_PACKAGE_BY_PACKAGE()
TRIBITS_CTEST_PACKAGE_BY_PACKAGE()

ENDIF()

Expand Down Expand Up @@ -2226,17 +2227,17 @@ FUNCTION(TRIBITS_CTEST_DRIVER)
IF ("${${PROJECT_NAME}_FAILED_PACKAGES}" STREQUAL "")
MESSAGE(
"${SEE_CDASH_LINK_STR}\n"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSSED\n")
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED\n")
ELSE()
# ToDo: Find out why other breaking tests don't fail when FATAL_ERROR is
# removed!
MESSAGE(FATAL_ERROR
"${SEE_CDASH_LINK_STR}\n"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL FAILED\n")
# NOTE: FATAL_ERROR is needed so that the ctest -S script returns != 0
# Also, it is critical to dislplay the "See results" in this
# Also, it is critical to display the "See results" in this
# MESSAGE(FATAL_ERROR ...) command in order for it to be printed last.
# Otherwise, if you run with ctest -V -S, then the ouptut from
# Otherwise, if you run with ctest -V -S, then the output from
# CTEST_TEST() will be printed last :-(
ENDIF()

Expand Down
Loading

0 comments on commit d1f3add

Please sign in to comment.