diff --git a/.codespellrc b/.codespellrc index 1d9d7ebf1..7af1d77f2 100644 --- a/.codespellrc +++ b/.codespellrc @@ -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 diff --git a/cmake/ctest/github_actions/ctest_github_actions_serial_debug.cmake b/cmake/ctest/github_actions/ctest_github_actions_serial_debug.cmake index 331019435..9441ba9d9 100644 --- a/cmake/ctest/github_actions/ctest_github_actions_serial_debug.cmake +++ b/cmake/ctest/github_actions/ctest_github_actions_serial_debug.cmake @@ -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 "") diff --git a/common_tools/git/hooks/post-receive-email b/common_tools/git/hooks/post-receive-email index 16e6ac95a..28dd910b5 100755 --- a/common_tools/git/hooks/post-receive-email +++ b/common_tools/git/hooks/post-receive-email @@ -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 diff --git a/test/ci_support/CDashQueryAnalyzeReport_UnitTests.py b/test/ci_support/CDashQueryAnalyzeReport_UnitTests.py index f120841c5..b58a81c86 100644 --- a/test/ci_support/CDashQueryAnalyzeReport_UnitTests.py +++ b/test/ci_support/CDashQueryAnalyzeReport_UnitTests.py @@ -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") @@ -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'], @@ -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'], @@ -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'], diff --git a/test/ci_support/CMakeCache.large.txt b/test/ci_support/CMakeCache.large.txt index 4b7f6e8af..8cf420a0a 100644 --- a/test/ci_support/CMakeCache.large.txt +++ b/test/ci_support/CMakeCache.large.txt @@ -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= diff --git a/test/ci_support/CMakeLists.txt b/test/ci_support/CMakeLists.txt index db1b1243f..72f10c493 100644 --- a/test/ci_support/CMakeLists.txt +++ b/test/ci_support/CMakeLists.txt @@ -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") @@ -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 diff --git a/test/ci_support/CheckinTest_UnitTests.py b/test/ci_support/CheckinTest_UnitTests.py index cc43cb216..a8e752ad4 100644 --- a/test/ci_support/CheckinTest_UnitTests.py +++ b/test/ci_support/CheckinTest_UnitTests.py @@ -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, @@ -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 @@ -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" \ , \ @@ -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" \ ) diff --git a/test/ci_support/CreateIssueTrackerFromCDashQuery_UnitTests.py b/test/ci_support/CreateIssueTrackerFromCDashQuery_UnitTests.py index 310ee05e0..9cd49f3de 100644 --- a/test/ci_support/CreateIssueTrackerFromCDashQuery_UnitTests.py +++ b/test/ci_support/CreateIssueTrackerFromCDashQuery_UnitTests.py @@ -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""" diff --git a/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake b/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake index 6004b26c4..ec03eb608 100644 --- a/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake +++ b/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake @@ -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. @@ -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} diff --git a/test/ctest_driver/MockCTestDriver/CMakeLists.txt b/test/ctest_driver/MockCTestDriver/CMakeLists.txt index e9883be15..a0ac3fd76 100644 --- a/test/ctest_driver/MockCTestDriver/CMakeLists.txt +++ b/test/ctest_driver/MockCTestDriver/CMakeLists.txt @@ -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" @@ -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 @@ -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 # _ENABLE_ALL_PACKAGES=ON is set (implicitly) but some packages are # disabled through setting _EXCLUDE_PACKAGES. This makes sure that # these disables are passed into the inner configure. diff --git a/test/ctest_driver/TribitsExampleProject/CMakeLists.txt b/test/ctest_driver/TribitsExampleProject/CMakeLists.txt index 69e823de4..b500d6f75 100644 --- a/test/ctest_driver/TribitsExampleProject/CMakeLists.txt +++ b/test/ctest_driver/TribitsExampleProject/CMakeLists.txt @@ -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" @@ -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 @@ -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 diff --git a/tribits/CHANGELOG.md b/tribits/CHANGELOG.md index d824c7810..e0335a5ef 100644 --- a/tribits/CHANGELOG.md +++ b/tribits/CHANGELOG.md @@ -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 `.) 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=`. In this case, if user sets `-D PYTHON_EXECUTABLE=` in the cache, TriBITS will set that value `` to the variable `Python3_EXECUTABLE` and avoid the call to @@ -292,7 +292,7 @@ ChangeLog for TriBITS `_LIB_ALL_DEPENDENCIES`. Now `_LIB_ENABLED_DEPENDENCIES` is automatically set from `_LIB_ALL_DEPENDENCIES` based on what TPLs are actually enabled. This avoids the problem described below from - directly setting `_LIB_ENABLED_DEPENDENCIES` without reguard to + directly setting `_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 @@ -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_)` 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 `` will now be enabled. (This mistake can happen when an optional dependency `` is changed to a required dependency but the `if()` statements based on `${PACKAGE_NAME}_ENABLE_` are not diff --git a/tribits/ci_support/CDashQueryAnalyzeReport.py b/tribits/ci_support/CDashQueryAnalyzeReport.py index 05237acc9..5d784ef79 100644 --- a/tribits/ci_support/CDashQueryAnalyzeReport.py +++ b/tribits/ci_support/CDashQueryAnalyzeReport.py @@ -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))+"!") @@ -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 diff --git a/tribits/ci_support/CreateIssueTrackerFromCDashQuery.py b/tribits/ci_support/CreateIssueTrackerFromCDashQuery.py index ebdafb0ea..2853452db 100644 --- a/tribits/ci_support/CreateIssueTrackerFromCDashQuery.py +++ b/tribits/ci_support/CreateIssueTrackerFromCDashQuery.py @@ -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 ) diff --git a/tribits/ci_support/TribitsDumpDepsXmlScript.cmake b/tribits/ci_support/TribitsDumpDepsXmlScript.cmake index 34b9bdafb..84845f9fe 100644 --- a/tribits/ci_support/TribitsDumpDepsXmlScript.cmake +++ b/tribits/ci_support/TribitsDumpDepsXmlScript.cmake @@ -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}") diff --git a/tribits/ci_support/TribitsPackageFilePathUtils.py b/tribits/ci_support/TribitsPackageFilePathUtils.py index 0d1f7d101..2de5d83cf 100644 --- a/tribits/ci_support/TribitsPackageFilePathUtils.py +++ b/tribits/ci_support/TribitsPackageFilePathUtils.py @@ -25,7 +25,7 @@ # # In general, any file at the top level / or under the # /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. # diff --git a/tribits/ci_support/cdash_build_testing_date.py b/tribits/ci_support/cdash_build_testing_date.py index fb2fb04ee..8622abdb9 100755 --- a/tribits/ci_support/cdash_build_testing_date.py +++ b/tribits/ci_support/cdash_build_testing_date.py @@ -107,7 +107,7 @@ def getTimeZoneOffset(timeZoneStr): # Return a timezone aware datetime object given an input date and time given # in the format "--
T:: ". # -# Note. the timzone can be any of those supported by the function +# Note. the timezone can be any of those supported by the function # getTimeZoneOffset() def getBuildStartTimeUtcFromStr(buildStartTimeStr): buildStartTimeStrArray = buildStartTimeStr.split(" ") @@ -156,7 +156,7 @@ def getDateOnlyFromDateTime(dateTime): # # buildStartTimeStr [in]: The 'buildstarttime' field string as returned from # CDash in the format "--
T:: ". Note. the -# timzone can be any of those supported by the function +# timezone can be any of those supported by the function # getTimeZoneOffset() # # testingDayStartTimeUtcTD [in]: The testing day start time as the a timedelta diff --git a/tribits/ci_support/is_checkin_tested_commit.py b/tribits/ci_support/is_checkin_tested_commit.py index e09ced5be..79cca7846 100755 --- a/tribits/ci_support/is_checkin_tested_commit.py +++ b/tribits/ci_support/is_checkin_tested_commit.py @@ -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. # diff --git a/tribits/core/config_tests/BLASMangling.cmake b/tribits/core/config_tests/BLASMangling.cmake index df945b34c..8030f2dce 100644 --- a/tribits/core/config_tests/BLASMangling.cmake +++ b/tribits/core/config_tests/BLASMangling.cmake @@ -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 diff --git a/tribits/core/config_tests/FortranMangling.cmake b/tribits/core/config_tests/FortranMangling.cmake index 148b84b1e..d06eb602f 100644 --- a/tribits/core/config_tests/FortranMangling.cmake +++ b/tribits/core/config_tests/FortranMangling.cmake @@ -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 diff --git a/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake b/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake index d62d67fbb..19e845498 100644 --- a/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake +++ b/tribits/core/package_arch/TribitsAdjustPackageEnables.cmake @@ -824,7 +824,7 @@ endmacro() # package ```` 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) diff --git a/tribits/core/package_arch/TribitsProcessTplsLists.cmake b/tribits/core/package_arch/TribitsProcessTplsLists.cmake index 8b4ec0221..3ba88c839 100644 --- a/tribits/core/package_arch/TribitsProcessTplsLists.cmake +++ b/tribits/core/package_arch/TribitsProcessTplsLists.cmake @@ -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** (````): The name of the TriBITS external package/TPL diff --git a/tribits/ctest_driver/README b/tribits/ctest_driver/README index af0c95117..73d2c8e23 100644 --- a/tribits/ctest_driver/README +++ b/tribits/ctest_driver/README @@ -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 Driver script to run, there can be diff --git a/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake b/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake index e0b7116cc..4f2e0e081 100644 --- a/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake +++ b/tribits/ctest_driver/TribitsCTestDriverCoreHelpers.cmake @@ -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() @@ -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") @@ -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 /CTestConfig.cmake + # Override any values by loading /CTestConfig.cmake include("${TRIBITS_PROJECT_ROOT}/CTestConfig.cmake") # Print out values read from project CTestCustom.cmake file @@ -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) diff --git a/tribits/ctest_driver/experimental_build_test.cmake b/tribits/ctest_driver/experimental_build_test.cmake index 65bb67db5..e5e785208 100644 --- a/tribits/ctest_driver/experimental_build_test.cmake +++ b/tribits/ctest_driver/experimental_build_test.cmake @@ -34,7 +34,7 @@ # There are a number of other options that you can change as # environment variables. See the macros set_default_and_from_env(...) # in the file TribitsCTestDriverCore.cmake. One option that you -# might want to overridde, for instance is CTEST_BUILD_NAME so that +# might want to override, for instance is CTEST_BUILD_NAME so that # you can insert a special name into the dashboard. # # When this script finishes running, the last package listed in diff --git a/tribits/devtools_install/install-openmpi.py b/tribits/devtools_install/install-openmpi.py index 0d975be7f..7a64278d3 100755 --- a/tribits/devtools_install/install-openmpi.py +++ b/tribits/devtools_install/install-openmpi.py @@ -55,7 +55,7 @@ def injectExtraCmndLineOptions(self, clp): help="Command used to check out "+self.getProductName()+" and dependent source tarball(s)." ) clp.add_option( "--extra-configure-options", dest="extraConfigureOptions", type="string", default="", - help="Extra options to add to the 'configure' cmmand for "+self.getProductName()+"." \ + help="Extra options to add to the 'configure' command for "+self.getProductName()+"." \ +" Note: This does not override the hard-coded configure options." ) clp.add_option( "--with-path", dest="withPath", type="string", default="", diff --git a/tribits/doc/build_ref/TribitsBuildReferenceBody.rst b/tribits/doc/build_ref/TribitsBuildReferenceBody.rst index b8601d6e8..32a15cbbf 100644 --- a/tribits/doc/build_ref/TribitsBuildReferenceBody.rst +++ b/tribits/doc/build_ref/TribitsBuildReferenceBody.rst @@ -506,7 +506,7 @@ packages. If one wants to enable a package along with the enable of other packages, but not the test suite for that package, then one can use a "exclude-list" -appraoch to disable the tests for that package by configuring with, for +approach to disable the tests for that package by configuring with, for example:: -D _ENABLE_=ON \ @@ -521,7 +521,7 @@ packages that might get implicitly enabled). One might use this approach if one wants to build and install package ```` but does not want to build and run the test suite for that package. -Alternatively, one can use an "include-list" appraoch to enable packages and +Alternatively, one can use an "include-list" approach to enable packages and only enable tests for specific packages, for example, configuring with:: -D _ENABLE_=ON \ diff --git a/tribits/doc/guides/TribitsCoreDetailedReference.rst b/tribits/doc/guides/TribitsCoreDetailedReference.rst index 1f07e959e..e7a0d8012 100644 --- a/tribits/doc/guides/TribitsCoreDetailedReference.rst +++ b/tribits/doc/guides/TribitsCoreDetailedReference.rst @@ -899,7 +899,7 @@ These options are described below. **TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE** Determines how the function `tribits_deprecated()`_ behaves. To change the - default behavor, such as call ``message(FATAL_ERROR ...)``, set:: + default behavior, such as call ``message(FATAL_ERROR ...)``, set:: set(TRIBITS_HANDLE_TRIBITS_DEPRECATED_CODE_DEFAULT FATAL_ERROR) diff --git a/tribits/doc/tutorial/src/TribitsTutorial_ConvertAProject.rst b/tribits/doc/tutorial/src/TribitsTutorial_ConvertAProject.rst index e80d56304..68a55652e 100644 --- a/tribits/doc/tutorial/src/TribitsTutorial_ConvertAProject.rst +++ b/tribits/doc/tutorial/src/TribitsTutorial_ConvertAProject.rst @@ -40,7 +40,7 @@ projects) TriBITS Packages ================ -The first thing to do when converting a projec to tribits is to think +The first thing to do when converting a project to tribits is to think about the structure of the project and to figure out the best way to break it into packages. In this section, I hope to give you a better idea of what exactly constitutes a tribits package and give you some @@ -101,7 +101,7 @@ You will also need to define any dependencies this package may have on other packages in the project. This is done in a File called Dependencies.camke in a cmake directory. All that is required in this file is a call to tribits_package_define_dependencies(). Even if the -package does not depand on another you still need to have this. +package does not depend on another you still need to have this. Example of simple package CMakeLists.txt files @@ -228,7 +228,7 @@ have the following files: will initialize your Tribits project, define which packages will be built by default, and define some setting for your project #. *PackagesList.cmake* - Tells tribits which packages are part of - this projec t and where to find them + this project and where to find them #. *TPLsList.cmke* - Tells tribits which TPLs that packages my depend on and how to find them #. *ProjectName.cmake* - defines the project name and possibly some @@ -305,7 +305,7 @@ Testing category (Required) - *ST (Secondary Tested)* - This code is very important to the project but will not necessarily halt development if it breaks. Consider making a package as ST if it depends on difficult to install TPLs or - TPLs that are not available no all deveopment platforms. + TPLs that are not available no all development platforms. - *EX (Experimental)* - This code is unstable and difficult to maintain. It is not portible or not important enough to be tested at the same level as other code @@ -361,7 +361,7 @@ Testing category (Required) productivity and would adversly effect customers if broken. - *ST (Secondary Tested)* - This tpl is important to the project but mat be difficult to install or the TPL is not available no all - deveopment platforms. + development platforms. - *EX (Experimental)* - TPL is experimental, unstable and/or difficult to maintain. @@ -441,7 +441,7 @@ where each line is one repo and - **REPO_NAME** is the name of the repo -- **REPO_DIR** is the relative path to the repo (asssumed to be +- **REPO_DIR** is the relative path to the repo (assumed to be ./REPO_NAME/ if it is blank) - **REPO_VCTYPE** the type of version control used for this repo (must diff --git a/tribits/doc/tutorial/src/TribitsTutorial_Dependencies.rst b/tribits/doc/tutorial/src/TribitsTutorial_Dependencies.rst index 061ed9f78..815ca635d 100644 --- a/tribits/doc/tutorial/src/TribitsTutorial_Dependencies.rst +++ b/tribits/doc/tutorial/src/TribitsTutorial_Dependencies.rst @@ -88,7 +88,7 @@ For you will see PT, ST, or EX. productivity and would adversly effect customers if broken. - *ST (Secondary Tested)* - This tpl is important to the project but may be difficult to install or the TPL is not available on all - deveopment platforms. + development platforms. - *EX (Experimental)* - TPL is experimental, unstable and/or difficult to maintain. diff --git a/tribits/doc/tutorial/src/TribitsTutorial_HelloWorld.rst b/tribits/doc/tutorial/src/TribitsTutorial_HelloWorld.rst index 3284283dd..a184d0058 100644 --- a/tribits/doc/tutorial/src/TribitsTutorial_HelloWorld.rst +++ b/tribits/doc/tutorial/src/TribitsTutorial_HelloWorld.rst @@ -411,7 +411,7 @@ to a diecroyr called "Install" in the current source tree:: set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/Install) -now clear the contents of the build directory and reconfigure, biuld, +now clear the contents of the build directory and reconfigure, build, and install the project with:: cmake ../ diff --git a/tribits/examples/TribitsExampleProject/packages/mixed_lang/test/tstRay_Tracer.cc b/tribits/examples/TribitsExampleProject/packages/mixed_lang/test/tstRay_Tracer.cc index c2561d0ae..e91eb6c84 100644 --- a/tribits/examples/TribitsExampleProject/packages/mixed_lang/test/tstRay_Tracer.cc +++ b/tribits/examples/TribitsExampleProject/packages/mixed_lang/test/tstRay_Tracer.cc @@ -15,7 +15,7 @@ typedef Tracer::Space_Vector Space_Vector; int nfail; int npass; -#define UNIT_TEST(a) if (!a){ ++nfail; } else { ++npass; } +#define UNIT_TEST(a) if (!(a)){ ++nfail; } else { ++npass; } //---------------------------------------------------------------------------// diff --git a/tribits/python_utils/generic-looping-demon.py b/tribits/python_utils/generic-looping-demon.py index 5494278e3..86bf91933 100755 --- a/tribits/python_utils/generic-looping-demon.py +++ b/tribits/python_utils/generic-looping-demon.py @@ -27,7 +27,7 @@ absolute time. The reason that the script takes an absolute time instead of a relative time -is that this script is desiged to drive continuous itegration (CI) processes +is that this script is designed to drive continuous integration (CI) processes where the CI process should shut down at some point. NOTE: The last iteration will not start later than --run-till=RUNTILL but the diff --git a/tribits/python_utils/gitdist.py b/tribits/python_utils/gitdist.py index e10b6716f..122f883dd 100755 --- a/tribits/python_utils/gitdist.py +++ b/tribits/python_utils/gitdist.py @@ -1041,7 +1041,7 @@ def getDistHelpTopicStr(helpTopicVal): if helpTopicHelpStr: helpTopicStr += helpTopicHelpStr else: - # Invalid help topic so return nonthing and help error handler deal! + # Invalid help topic so return nothing and help error handler deal! return "" return helpTopicStr