Skip to content

Commit

Permalink
Merge pull request #627 from bartlettroscoe/test-fixes-2025-02-19
Browse files Browse the repository at this point in the history
Fix GHA check failures 2025-02-19
  • Loading branch information
bartlettroscoe authored Feb 19, 2025
2 parents ade2bbb + 0c4dfff commit 2d7ea1b
Show file tree
Hide file tree
Showing 34 changed files with 62 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ check-hidden =
# Disable warnings about binary files
quiet-level = 2
skip = */.git,*/common_tools/cloc,*/TriBITSDoc,*/tribits/doc/guides/rst2latex.tex,*/*.js,*/*.svg,*/tribits/doc/sphinx/*/index.html,*~
ignore-words-list = thur,inout,te,nd,lod,aci,nin,nnumber,wile,reall,bu,somewhere
ignore-words-list = thur,inout,te,nd,lod,aci,nin,nnumber,wile,reall,bu,somewhere,strin
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ set( EXTRA_CONFIGURE_OPTIONS
"-DTriBITS_ENABLE_REAL_GIT_CLONE_TESTS=TRUE"
"-DTriBITS_TRACE_ADD_TEST=ON"
"-DTriBITS_SHOW_TEST_START_END_DATE_TIME=ON"
"-DTriBITS_CTestDriver_AAOP_ST_ALL_COVERAGE_SET_DISABLED_AND_MSG=Are_Timing_Out"
"-DTriBITS_CTestDriver_PBP_ST_ALL_COVERAGE_SET_DISABLED_AND_MSG=Are_Timing_Out"
)

if ("$ENV{CTEST_TEST_TYPE}" STREQUAL "")
Expand Down
2 changes: 1 addition & 1 deletion common_tools/git/hooks/post-receive-email
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
# about what exactly happens in all the different cases that are handled,
# possibly at the expense of introducing redundant code.
#
# Unused config options (annoucements list) were removed. And the output
# Unused config options (announcements list) were removed. And the output
# is much less geeky (far fewer sha1s)

# ---------------------------- Functions
Expand Down
8 changes: 4 additions & 4 deletions test/ci_support/CDashQueryAnalyzeReport_UnitTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ def test_col_3_row_2_bad_row_len_fail(self):
self.assertEqual( str(errMsg),
"Error, for CSV file '"+csvFileName+"' the data row 1"+\
" ['val_10', 'val_11', 'val_12', 'extra'] has 4 entries"+\
" which does not macth the number of column headers 3!" )
" which does not match the number of column headers 3!" )
if not threwException:
self.assertFalse("ERROR: Did not throw an exception")

Expand Down Expand Up @@ -2474,7 +2474,7 @@ def test_nonpassingTest_downloadFromCDash(self):

testHistoryBrowserUrl = u('site.com/cdash/queryTests.php?project=projectName&begin=2000-12-28&end=2001-01-01&filtercombine=and&filtercombine=&filtercount=3&showfilters=1&filtercombine=and&field1=buildname&compare1=61&value1=build_name&field2=testname&compare2=61&value2=test_name&field3=site&compare3=61&value3=site_name')

# Checkt the set fields out output
# Check the set fields out output
self.assertEqual(testDict['site'], 'site_name')
self.assertEqual(testDict['buildName'], 'build_name')
self.assertEqual(testDict['buildName_url'],
Expand Down Expand Up @@ -2586,7 +2586,7 @@ def test_mdt_nonpassingTest_downloadFromCDash(self):

testHistoryBrowserUrl = u('site.com/cdash/queryTests.php?project=projectName&begin=2000-12-29&end=2001-01-02&filtercombine=and&filtercombine=&filtercount=3&showfilters=1&filtercombine=and&field1=buildname&compare1=61&value1=build_name&field2=testname&compare2=61&value2=test_name&field3=site&compare3=61&value3=site_name')

# Checkt the set fields out output
# Check the set fields out output
self.assertEqual(testDict['site'], 'site_name')
self.assertEqual(testDict['buildName'], 'build_name')
self.assertEqual(testDict['buildName_url'],
Expand Down Expand Up @@ -3234,7 +3234,7 @@ def test_funky_chars(self):
buildName_url=buildName_url,
siteName_url=siteName_url))

# Checkt the set fields out output
# Check the set fields out output
self.assertEqual(funkyCharTestDict['site'], 'site name')
self.assertEqual(funkyCharTestDict['buildName'], 'build++')
self.assertEqual(funkyCharTestDict['buildName_url'],
Expand Down
2 changes: 1 addition & 1 deletion test/ci_support/CMakeCache.large.txt
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ CMAKE_Fortran_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
//If set to non-empty, will override CMAKE_Fortran_FLAGS_RELWITHDEBINFO
CMAKE_Fortran_FLAGS_RELWITHDEBINFO_OVERRIDE:STRING=

//Base install directory (overridde default from "/usr/local" to
//Base install directory (override default from "/usr/local" to
// empty "")
CMAKE_INSTALL_PREFIX:PATH=

Expand Down
4 changes: 2 additions & 2 deletions test/ci_support/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
add_subdirectory(DumpXmlDepsTests)

# In case the project has ${PROJECT_NAME}_TRIBITS_DIR pointing to a symlink,
# use the TriBITS implenetation in these test (which should be the same)
# use the TriBITS implementation in these test (which should be the same)
set(THIS_TRIBITS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../tribits")


Expand Down Expand Up @@ -441,7 +441,7 @@ tribits_add_advanced_test( TribitsExampleProject_checkin_test
TribitsExampleProject
# NOTE: Had to use 'cp -r' instead of 'cmake -E copy_directory' because
# the latter failed for a development version of CMake. But since the
# checkin-test.py scrpt will really only run on Linux/Unix systems, using
# checkin-test.py script will really only run on Linux/Unix systems, using
# 'cp -r' is not a testing portability problem.

TEST_1
Expand Down
10 changes: 5 additions & 5 deletions test/ci_support/CheckinTest_UnitTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -1628,7 +1628,7 @@ def checkin_test_run_case(testObject, testName, optionsStr, cmndInterceptsStr, \
"--with-cmake=\""+g_withCmake+"\"",
"--project-name=Trilinos",
"--src-dir="+mockProjectBaseDir,
"--send-email-to=bogous@somewhere.com",
"--send-email-to=bogus@somewhere.com",
"--project-configuration=%s" % os.path.join(g_testBaseDir,
'CheckinTest_UnitTests_Config.py'),
optionsStr,
Expand Down Expand Up @@ -1658,7 +1658,7 @@ def checkin_test_run_case(testObject, testName, optionsStr, cmndInterceptsStr, \

if inPathGit:
baseCmndInterceptsStr += \
"IT: git config --get user.email; 0; bogous@somewhere.com\n" \
"IT: git config --get user.email; 0; bogus@somewhere.com\n" \
+"IT: which git; 0; /some/path/git\n"

fullCmndInterceptsStr = baseCmndInterceptsStr + cmndInterceptsStr
Expand Down Expand Up @@ -2237,7 +2237,7 @@ def test_do_all_no_git_installed(self):
+" --do-all --push" \
,
\
"IT: git config --get user.email; 0; bogous@somewhere.com\n" \
"IT: git config --get user.email; 0; bogus@somewhere.com\n" \
+"IT: which git; 1; '/usr/bin/which: no git in (path1:path2:path3)'\n" \
,
\
Expand Down Expand Up @@ -5634,9 +5634,9 @@ def test_send_email_only_on_failure_do_all_mpi_debug_build_configure_fail(self):
+g_expectedRegexBuildPasses \
+g_expectedRegexTestPasses \
+g_expectedCommonOptionsSummary \
+"Running: mailx -s .FAILED: Trilinos/MPI_DEBUG: configure failed. bogous@somewhere.com\n" \
+"Running: mailx -s .FAILED: Trilinos/MPI_DEBUG: configure failed. bogus@somewhere.com\n" \
+"SERIAL_RELEASE: Skipping sending build/test case email because it passed and --send-email-only-on-failure was set!\n" \
+"Running: mailx -s .FAILED CONFIGURE/BUILD/TEST: Trilinos: .* bogous@somewhere.com\n" \
+"Running: mailx -s .FAILED CONFIGURE/BUILD/TEST: Trilinos: .* bogus@somewhere.com\n" \
)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def test_t2_b2(self):
Writing out new issue tracker text to 'newGitHubIssue.md'
Writing out list of test/biuld pairs for CSV file 'newTestsWithIssueTrackers.csv'
Writing out list of test/build pairs for CSV file 'newTestsWithIssueTrackers.csv'
"""

g_example_t2_b2_github_issue = r"""
Expand Down
4 changes: 2 additions & 2 deletions test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ tribits_add_advanced_test( TribitsExampleProject_install_perms
# ATDV-241).
#
# * Even with the source directory permissions being 'rwx------' (i.e. 700),
# the files isntalled under share/WithSubpackagesB/stuff using
# the files installed under share/WithSubpackagesB/stuff using
# install(DIRECTORY ... USE_SOURCE_PERMISSIONS) will actually have the
# correct group and other permissions set.

Expand Down Expand Up @@ -3122,7 +3122,7 @@ tribits_add_advanced_test( TribitsExampleProject_DisableWithSubpackagesB_EnableW

TEST_0
MESSAGE "Just do dependency analysis to test enabling of parent package"
" with eanbled subpackages even if is disabled"
" with enabled subpackages even if is disabled"
CMND ${CMAKE_COMMAND}
ARGS
-DTribitsExProj_TRIBITS_DIR=${${PROJECT_NAME}_TRIBITS_DIR}
Expand Down
6 changes: 3 additions & 3 deletions test/ctest_driver/MockCTestDriver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ create_ctest_dependency_handling_test_case(
EnableAll_EnableStokhos
ARGS Trilinos_ADDITIONAL_PACKAGES=Stokhos
PASS_REGULAR_EXPRESSION_ALL
"Enabling explicitly set package Stokhos which was default or otherwise disabed!"
"Enabling explicitly set package Stokhos which was default or otherwise disabled!"
"Explicitly enabled top-level packages on input .* Stokhos 1"
"Explicitly disabled top-level packages on input .* 0"
"Enabling all packages that are not currently disabled because of Trilinos_ENABLE_ALL_PACKAGES=ON"
Expand Down Expand Up @@ -906,7 +906,7 @@ if (Python3_EXECUTABLE)
"Done with the all-at-once configure, build, test, and submit of Trilinos packages"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
)
# NOTE: The above test is for the all-at-once appraoch that checks for the
# NOTE: The above test is for the all-at-once approach that checks for the
# ALL_PACKAGES value in failedPackages.txt. That value can be returned from
# a configure failure in a previous all-at-once CI build. This test makes
# sure that all packages will get enabled in the follow-up CI iteration in
Expand Down Expand Up @@ -936,7 +936,7 @@ if (Python3_EXECUTABLE)
"Done with the all-at-once configure, build, test, and submit of Trilinos packages"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
)
# NOTE: The above test is for the all-at-once appraoch where
# NOTE: The above test is for the all-at-once approach where
# <Project>_ENABLE_ALL_PACKAGES=ON is set (implicitly) but some packages are
# disabled through setting <Project>_EXCLUDE_PACKAGES. This makes sure that
# these disables are passed into the inner configure.
Expand Down
6 changes: 3 additions & 3 deletions test/ctest_driver/TribitsExampleProject/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,7 @@ function(generate_aao_tests)
"WithSubpackagesC_test_of_c_util [.]+ +Passed"
"WithSubpackagesC_test_of_c_b_mixed_lang [.]+ +Passed"
"WrapExternal_run_external_func [.]+ +Passed"
"Skipping converage tests because CTEST_DO_COVERAGE_TESTING='OFF'"
"Skipping coverage tests because CTEST_DO_COVERAGE_TESTING='OFF'"
"Skipping memory testing because CTEST_DO_MEMORY_TESTING='FALSE'"
"File '' does NOT exist so all tests passed"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
Expand Down Expand Up @@ -2151,7 +2151,7 @@ function(generate_aao_tests)
"Building all targets"
"Build PASSED"
"Skipping tests because CTEST_DO_TEST='OFF'"
"Skipping converage tests because CTEST_DO_COVERAGE_TESTING='OFF'"
"Skipping coverage tests because CTEST_DO_COVERAGE_TESTING='OFF'"
"Skipping memory testing because CTEST_DO_MEMORY_TESTING='FALSE'"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
Expand Down Expand Up @@ -2189,7 +2189,7 @@ function(generate_aao_tests)
"-- CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE='54321'"
"-- CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE='123456'"
"File '' does NOT exist so all tests passed"
"Skipping converage tests because CTEST_DO_COVERAGE_TESTING='OFF'"
"Skipping coverage tests because CTEST_DO_COVERAGE_TESTING='OFF'"
"Skipping memory testing because CTEST_DO_MEMORY_TESTING='FALSE'"
"TRIBITS_CTEST_DRIVER: OVERALL: ALL PASSED"
ALWAYS_FAIL_ON_NONZERO_RETURN
Expand Down
6 changes: 3 additions & 3 deletions tribits/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ChangeLog for TriBITS
when upgrading TriBITS. (This change can be made automatically in all of
the project's CMake files by running the script
`tribits/refactoring/to-python3.sh <dir>`.) However, backward compatibility
is provided for users confiugring TriBITS CMake projects which set `-D
is provided for users configuring TriBITS CMake projects which set `-D
PYTHON_EXECUTABLE=<path>`. In this case, if user sets `-D
PYTHON_EXECUTABLE=<path>` in the cache, TriBITS will set that value `<path>`
to the variable `Python3_EXECUTABLE` and avoid the call to
Expand Down Expand Up @@ -292,7 +292,7 @@ ChangeLog for TriBITS
`<tplName>_LIB_ALL_DEPENDENCIES`. Now `<tplName>_LIB_ENABLED_DEPENDENCIES`
is automatically set from `<tplName>_LIB_ALL_DEPENDENCIES` based on what
TPLs are actually enabled. This avoids the problem described below from
directly setting `<tplName>_LIB_ENABLED_DEPENDENCIES` without reguard to
directly setting `<tplName>_LIB_ENABLED_DEPENDENCIES` without regard to
what TPLs are actually enabled. This maintains backward compatibility for
existing configure scripts where an upstream TPL may not be enabled in some
strange configure scripts (see
Expand Down Expand Up @@ -347,7 +347,7 @@ ChangeLog for TriBITS
(in order to simplify internal TriBITS logic). However, a side-effect of
this change is that CMake code that was ifed out with an `if
(${PACKAGE_NAME}_ENABLE_<depPkg>)` statement (because that variable was not
defined and therefore defaults to `FLASE`) for a required upstream
defined and therefore defaults to `FALSE`) for a required upstream
dependency `<depPkg>` will now be enabled. (This mistake can happen when an
optional dependency `<depPkg>` is changed to a required dependency but the
`if()` statements based on `${PACKAGE_NAME}_ENABLE_<depPkg>` are not
Expand Down
4 changes: 2 additions & 2 deletions tribits/ci_support/CDashQueryAnalyzeReport.py
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ def assertExpectedNumColsFromCsvFile(csvFileName, dataRow, lineList,
raise Exception(
"Error, for CSV file '"+csvFileName+"' the data row"+\
" "+str(dataRow)+" "+str(lineList)+" has"+\
" "+str(len(lineList))+" entries which does not macth"+\
" "+str(len(lineList))+" entries which does not match"+\
" the number of column headers "+str(len(columnHeadersList))+"!")


Expand Down Expand Up @@ -1068,7 +1068,7 @@ def lookupDictGivenLookupDict(lookupDict, listOfKeys, listOfValues,
# given a list key/value pairs to match
#
# Once created, this object acts like a list of dicts in most cases but also
# contains functions to search for speicfic dicts given a set of key/value
# contains functions to search for specific dicts given a set of key/value
# pairs.
#
# Any modifications to the dicts looked up with this object will edit the
Expand Down
2 changes: 1 addition & 1 deletion tribits/ci_support/CreateIssueTrackerFromCDashQuery.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def writeNewIssueTrackerFile(self, issueTrackerText):

def writeNewTestsWithIssueTrackersFile(self, uniqNonpassingTestsLOD):
if self.options.newTestsWithIssueTrackersFile:
print("\nWriting out list of test/biuld pairs for CSV file '"\
print("\nWriting out list of test/build pairs for CSV file '"\
+self.options.newTestsWithIssueTrackersFile+"'")
csvFileStruct = CDQAR.writeTestsListOfDictsToCsvFileStructure(uniqNonpassingTestsLOD,
self.issueTrackerUrlTemplate, self.issueTrackerTemplate )
Expand Down
2 changes: 1 addition & 1 deletion tribits/ci_support/TribitsDumpDepsXmlScript.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ endif()
# Execute the rest of the script now that everything has been asserted or found
#

# Get the TRIBITS_DIR (we can always find this easy since this scrit is in TriBITS)
# Get the TRIBITS_DIR (we can always find this easy since this script is in TriBITS)
get_filename_component( ${PROJECT_NAME}_TRIBITS_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE )
message("-- Setting ${PROJECT_NAME}_TRIBITS_DIR=${${PROJECT_NAME}_TRIBITS_DIR}")

Expand Down
2 changes: 1 addition & 1 deletion tribits/ci_support/TribitsPackageFilePathUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#
# In general, any file at the top level <projectDir>/ or under the
# <projectDir>/cmake/ directory with the extension *.cmake is considered a
# file that requires a global rebuild of all packaes. However, there are a
# file that requires a global rebuild of all packages. However, there are a
# few special files that we don't want to have to do a global rebuild for by
# default.
#
Expand Down
4 changes: 2 additions & 2 deletions tribits/ci_support/cdash_build_testing_date.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def getTimeZoneOffset(timeZoneStr):
# Return a timezone aware datetime object given an input date and time given
# in the format "<YYYY>-<MM>-<DD>T<hh>:<mm>:<ss> <TZ>".
#
# Note. the timzone <TZ> can be any of those supported by the function
# Note. the timezone <TZ> can be any of those supported by the function
# getTimeZoneOffset()
def getBuildStartTimeUtcFromStr(buildStartTimeStr):
buildStartTimeStrArray = buildStartTimeStr.split(" ")
Expand Down Expand Up @@ -156,7 +156,7 @@ def getDateOnlyFromDateTime(dateTime):
#
# buildStartTimeStr [in]: The 'buildstarttime' field string as returned from
# CDash in the format "<YYYY>-<MM>-<DD>T<hh>:<mm>:<ss> <TZ>". Note. the
# timzone <TZ> can be any of those supported by the function
# timezone <TZ> can be any of those supported by the function
# getTimeZoneOffset()
#
# testingDayStartTimeUtcTD [in]: The testing day start time as the a timedelta
Expand Down
2 changes: 1 addition & 1 deletion tribits/ci_support/is_checkin_tested_commit.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
gitRef = "HEAD"

#
# B) Deterimine if the commit was tested and pushed with checkin-test.py
# B) Determine if the commit was tested and pushed with checkin-test.py
# script.
#

Expand Down
2 changes: 1 addition & 1 deletion tribits/core/config_tests/BLASMangling.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# appended.
#
# BLAS_FUNC_DEFAULT
# The default mange mangling for Fortran functions
# The default mangling for Fortran functions
# that do not contain an underscore.
#
# The Fortran 2003 name binding facilities and ISO_C_BINDING module
Expand Down
4 changes: 2 additions & 2 deletions tribits/core/config_tests/FortranMangling.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ include(GlobalSet)
# appended.
#
# FC_FUNC_DEFAULT
# The default mange mangling for Fortran functions
# The default mangling for Fortran functions
# that do not contain an underscore.
#
# FC_FUNC__DEFAULT
# The default mange mangling for Fortran functions
# The default mangling for Fortran functions
# that do contain an underscore.
#
# The Fortran 2003 name binding facilities and ISO_C_BINDING module
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ endmacro()
# package ``<packageName>`` are set as EXTERNAL as well. (We don't allow a
# subset of subpackages in a parent package to be EXTERNAL and the other
# subpackages to be INTERNAL. That would be way too complicated to implement
# and be way too confusing for implementors and users.)
# and be way too confusing for implementers and users.)
#
macro(tribits_set_package_and_related_upstream_packages_to_external packageName)

Expand Down
2 changes: 1 addition & 1 deletion tribits/core/package_arch/TribitsProcessTplsLists.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ include(Split)
#
# This macro sets up a 2D array of ``NumTPLS`` by ``NumColumns`` listing out
# the `TriBITS TPLs`_ for a `TriBITS Repository`_. Each row (with 3 entries)
# specifies a different TriBITS exernal package/TPL which contains the columns
# specifies a different TriBITS external package/TPL which contains the columns
# (ordered 0-2):
#
# 0. **TPL** (``<tpli_name>``): The name of the TriBITS external package/TPL
Expand Down
2 changes: 1 addition & 1 deletion tribits/ctest_driver/README
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ dashboards. You would do this with:
E) Debugging problems:
======================

Debugging the inner CTest dashbaords should be more straightforward as
Debugging the inner CTest dashboards should be more straightforward as
described in D.1 above.

When first getting the outer <Project>Driver script to run, there can be
Expand Down
8 changes: 4 additions & 4 deletions tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ macro(enable_package_if_not_explicitly_excluded TRIBITS_PACKAGE)
if (${TRIBITS_PACKAGE}_EXPLICITY_EXCLUDED)
message("NOT enabling explicitly set package ${TRIBITS_PACKAGE} since it was explicitly excluded!")
else()
message("Enabling explicitly set package ${TRIBITS_PACKAGE} which was default or otherwise disabed!")
message("Enabling explicitly set package ${TRIBITS_PACKAGE} which was default or otherwise disabled!")
set(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE} ON)
endif()
else()
Expand Down Expand Up @@ -955,7 +955,7 @@ macro(tribits_ctest_package_by_package)
set(PBP_CONFIGURE_PASSED TRUE)
# load target properties and test keywords
ctest_read_custom_files(BUILD "${CTEST_BINARY_DIRECTORY}")
# Overridde from this file!
# Override from this file!
include("${TRIBITS_PROJECT_ROOT}/CTestConfig.cmake")
else()
message("\n${TRIBITS_PACKAGE} FAILED to configure!\n")
Expand Down Expand Up @@ -1384,7 +1384,7 @@ macro(tribits_ctest_all_at_once)
# configure failed and the file CTestCustom.cmake does exist. In this case,
# CTest will just do nothing.

# Overridde any values by loading <projectDir>/CTestConfig.cmake
# Override any values by loading <projectDir>/CTestConfig.cmake
include("${TRIBITS_PROJECT_ROOT}/CTestConfig.cmake")

# Print out values read from project CTestCustom.cmake file
Expand Down Expand Up @@ -1531,7 +1531,7 @@ macro(tribits_ctest_all_at_once)
if (NOT CTEST_DO_COVERAGE_TESTING)

message("")
message("Skipping converage tests because CTEST_DO_COVERAGE_TESTING='${CTEST_DO_COVERAGE_TESTING}'!")
message("Skipping coverage tests because CTEST_DO_COVERAGE_TESTING='${CTEST_DO_COVERAGE_TESTING}'!")
message("")

elseif (NOT AAO_CONFIGURE_PASSED)
Expand Down
Loading

0 comments on commit 2d7ea1b

Please sign in to comment.