Skip to content

Commit

Permalink
Spelling fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
gsjaardema committed Aug 2, 2021
1 parent 0681524 commit c716a74
Show file tree
Hide file tree
Showing 105 changed files with 303 additions and 303 deletions.
6 changes: 3 additions & 3 deletions common_tools/cloc/README
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Included in this directory is a snapshot of the GPL Perl script cloc.pl. This
is a source code line counting tool. Also contained in this directory are the
files cloc.<LANGUAGE_TYPE>.in that defines specializations of the default cloc
langauge definitions for TriBITS software. Adding a language definition file
language definitions for TriBITS software. Adding a language definition file
directly to TriBITS aids in trying to help standardize the names of language
files a little.

Expand All @@ -19,10 +19,10 @@ Here, the different language definition files are:
$TRIBITS_DIR/common_tools/cloc/cloc.core-languages.in
$TRIBITS_DIR/common_tools/cloc/cloc.script-languages.in

Different TriBITS projects can copy these langauge definition files and define
Different TriBITS projects can copy these language definition files and define
their own language standards. However, for the purposes of TriBITS meta build
across projects, it would be beneficial if all TriBITS projects could use a
single standard for language file extensions.

This will print statisitics to the screen. See cloc.pl --help for other
This will print statistics to the screen. See cloc.pl --help for other
useful option.
8 changes: 4 additions & 4 deletions common_tools/cloc/cloc.pl
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ BEGIN
name per line. See also --exclude-list-file.
--unicode Check binary files to see if they contain Unicode
expanded ASCII text. This causes performance to
drop noticably.
drop noticeably.
${BB}Processing Options${NN}
--autoconf Count .in files (as processed by GNU autoconf) of
Expand Down Expand Up @@ -2757,7 +2757,7 @@ sub classify_file { # {{{1
foreach my $extension (@extension_list) {
if ($Not_Code_Extension{$extension} and
!$Forced_Extension{$extension}) {
# If .1 (for example) is an extention that would ordinarily be
# If .1 (for example) is an extension that would ordinarily be
# ignored but the user has insisted this be counted with the
# --force-lang option, then go ahead and count it.
$rh_ignored->{$full_file} =
Expand Down Expand Up @@ -6653,7 +6653,7 @@ sub matlab_or_objective_C { # {{{1
# Objective C without a doubt
$objective_C_points = 1;
$matlab_points = 0;
printf ".m: #includ obj C=% 2d matlab=% 2d mumps=% 2d\n", $objective_C_points, $matlab_points, $mumps_points if $DEBUG;
printf ".m: #include obj C=% 2d matlab=% 2d mumps=% 2d\n", $objective_C_points, $matlab_points, $mumps_points if $DEBUG;
last;
} elsif (m{^\s*@(interface|implementation|protocol|public|protected|private|end)\s}o) {
# Objective C without a doubt
Expand Down Expand Up @@ -8184,7 +8184,7 @@ sub really_is_incpascal { # {{{1

# The heuristic is as follows: it is Pacal if any of the following:
# 1. really_is_pascal returns true
# 2. Any usual reserverd word is found (program, unit, const, begin...)
# 2. Any usual reserved word is found (program, unit, const, begin...)

# If the general routine for Pascal files works, we have it
if (&really_is_pascal ($filename)) {
Expand Down
2 changes: 1 addition & 1 deletion common_tools/git/commit-summary-over-periods.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
This script collects statistics for the number of commit by the given authors
over a number of time periods (default months) and produces a summary table
sutable for import and plotting.
suitable for import and plotting.
"""

from optparse import OptionParser
Expand Down
2 changes: 1 addition & 1 deletion common_tools/git/find_largest_git_files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# 1) Removed the division by /1024 because it did not allow printing smaller
# sizes. Now the script reports sizes in bytes, not kilobites
#
# 2) Accept number <N> in command-line arugment for number of files to report
# 2) Accept number <N> in command-line argument for number of files to report
# sizes for.

# set the internal field spereator to line break, so that we can iterate easily over the verify-pack output
Expand Down
2 changes: 1 addition & 1 deletion common_tools/git/hooks/README.SETUP
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Set up email notification hooks

$ cd GIT_REPO_BASE_DIR
$ echo "
base_dir_1/subdir email1@somthing.com,email2@somthing.com
base_dir_1/subdir email1@something.com,email2@something.com
base_dir_1 [email protected]
...
.+ [email protected]
Expand Down
2 changes: 1 addition & 1 deletion common_tools/git/hooks/get_recipients.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@


#
# B) Pick out recipients based on matches to directories chagned
# B) Pick out recipients based on matches to directories changed
#

output=commands.getoutput("git diff --name-only %s %s" % (oldrev, newrev))
Expand Down
6 changes: 3 additions & 3 deletions common_tools/git/hooks/post-receive-email
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
# ------------------------------------
# If you care... The original script jumped through extra hoops to make sure
# the log info for commit messages was only ever sent once. For example, if
# a push added existing commits to a different branch, it would not list thos
# a push added existing commits to a different branch, it would not list those
# commit messages in the email. Here, we always list the commit messages for
# all the commits that change a branch.
#
Expand Down Expand Up @@ -251,7 +251,7 @@ generate_update_branch_email()
#
# git rev-parse --not --all | grep -v $(git rev-parse $refname)
#
# Get's us to something pretty safe (apart from the small time
# Gets us to something pretty safe (apart from the small time
# between refname being read, and git rev-parse running - for that,
# I give up)
#
Expand Down Expand Up @@ -340,7 +340,7 @@ generate_update_branch_email()
echo " \\"
echo " O -- O -- O ($oldrev)"
echo ""
echo "The removed revisions are not necessarilly gone - if another reference"
echo "The removed revisions are not necessarily gone - if another reference"
echo "still refers to them they will stay in the repository."
echo ""
rewind_only=1
Expand Down
4 changes: 2 additions & 2 deletions common_tools/git/hooks/pre-receive-check-policy
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# This script checks gnome.org policy about how people are supposed to
# use git; the intent of the policy is to keep people from shooting
# themselve in the foot.
# themselves in the foot.
#
# Eventually, we'd like to have an ability to override policy; one way
# it could work is that if you did 'git push --exec=force' and you
Expand Down Expand Up @@ -134,7 +134,7 @@ EOF
#
# Expression here is same as in post-receive-notify-cia; we take
# all the branches in the repo, as "^/ref/heads/branchname", other
# than the branch we are actualy committing to, and exclude commits
# than the branch we are actually committing to, and exclude commits
# already on those branches from the list of commits between
# $oldrev and $newrev.

Expand Down
10 changes: 5 additions & 5 deletions test/ci_support/CMakeCache.large.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1645,10 +1645,10 @@ MPI_C_LINK_FLAGS:STRING= -Wl,-rpath -Wl,/projects/vera/gcc-4.8.3/toolset/mpich-
//Where can one of the mpiexec or mpirun libraries be found
MPI_EXEC:FILEPATH=/projects/vera/gcc-4.8.3/toolset/mpich-3.1.3/bin/mpiexec

//The default mumber of processes to use when running MPI programs.
//The default number of processes to use when running MPI programs.
MPI_EXEC_DEFAULT_NUMPROCS:STRING=4

//The maximum mumber of processes to use when running MPI programs.
//The maximum number of processes to use when running MPI programs.
// Tests with more procs are excluded.
MPI_EXEC_MAX_NUMPROCS:STRING=12

Expand Down Expand Up @@ -3889,7 +3889,7 @@ TPL_QT_INCLUDE_DIRS:PATH=/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/include/QtDe
TPL_QT_LIBRARIES:PATH=/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/lib/libQtXmlPatterns.so;/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/lib/libQtNetwork.so;optimized;/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/lib/libQtSql.so;debug;/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/lib/libQtSql_debug.so;/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/lib/libQtGui.so;optimized;/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/lib/libQtTest.so;debug;/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/lib/libQtTest_debug.so;optimized;/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/lib/libQtXml.so;debug;/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/lib/libQtXml_debug.so;optimized;/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/lib/libQtCore.so;debug;/projects/vera/gcc-4.8.3/tpls/opt/qt-4.8.2/lib/libQtCore_debug.so;pthread

//A FindTPLQT.cmake specific variable that defines where the Qt
// Qmake Execuatable is
// Qmake Executable is
TPL_QT_QMAKE_EXECUTABLE:STRING=

//List of semi-colon separated paths to append to the compile invocations
Expand Down Expand Up @@ -4276,7 +4276,7 @@ Tpetra_INST_COMPLEX_FLOAT:BOOL=OFF
Tpetra_INST_CUDA:BOOL=OFF

//Instantiate and/or test Tpetra classes over Scalar = dd_real
// (requries TPL QD). This option is OFF by default.
// (requires TPL QD). This option is OFF by default.
Tpetra_INST_DD_REAL:BOOL=OFF

//Set by default in vera-core-enables.disables.cmake
Expand Down Expand Up @@ -4316,7 +4316,7 @@ Tpetra_INST_OPENMP:BOOL=OFF
Tpetra_INST_PTHREAD:BOOL=OFF

//Instantiate and/or test Tpetra classes over Scalar = qd_real
// (requries TPL QD). This option is OFF by default.
// (requires TPL QD). This option is OFF by default.
Tpetra_INST_QD_REAL:BOOL=OFF

//Set by default in vera-core-enables.disables.cmake
Expand Down
30 changes: 15 additions & 15 deletions test/ci_support/CheckinTest_UnitTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -1627,7 +1627,7 @@ def checkin_test_run_case(testObject, testName, optionsStr, cmndInterceptsStr, \
"--with-cmake=\""+g_withCmake+"\"",
"--project-name=Trilinos",
"--src-dir="+mockProjectBaseDir,
"--send-email-to=bogous@somwhere.com",
"--send-email-to=bogous@somewhere.com",
"--project-configuration=%s" % os.path.join(g_testBaseDir,
'CheckinTest_UnitTests_Config.py'),
optionsStr,
Expand Down Expand Up @@ -1657,7 +1657,7 @@ def checkin_test_run_case(testObject, testName, optionsStr, cmndInterceptsStr, \

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

fullCmndInterceptsStr = baseCmndInterceptsStr + cmndInterceptsStr
Expand Down Expand Up @@ -1724,7 +1724,7 @@ def checkin_test_run_case(testObject, testName, optionsStr, cmndInterceptsStr, \
os.environ['GENERAL_SCRIPT_SUPPORT_CMND_INTERCEPTS_FILE']=""


# Helper test case that is used as the inital case for other tests
# Helper test case that is used as the initial case for other tests
def g_test_do_all_default_builds_mpi_debug_pass(testObject, testName):
checkin_test_run_case(
\
Expand Down Expand Up @@ -2138,15 +2138,15 @@ def test_do_all_push_pass(self):
assertFileNotExists(self, serialReleaseDir+"/email.success")
assertFileNotExists(self, serialReleaseDir+"/email.out")

# Make sure that the readyness check after the push reports the right
# Make sure that the readiness check after the push reports the right
# status.
checkin_test_run_case(
\
self,
\
testName,
\
"", # Just the default the readyness check!
"", # Just the default the readiness check!
\
g_cmndinterceptsDumpDepsXMLFile \
+cmndinterceptsGetRepoStatsPass() \
Expand All @@ -2163,7 +2163,7 @@ def test_do_all_push_pass(self):
+"REQUESTED ACTIONS: FAILED\n" \
)

# Make sure that the readyness check ignoring no --pull returns the right
# Make sure that the readiness check ignoring no --pull returns the right
# status status.
checkin_test_run_case(
\
Expand Down Expand Up @@ -2233,7 +2233,7 @@ def test_do_all_no_git_installed(self):
+" --do-all --push" \
,
\
"IT: git config --get user.email; 0; bogous@somwhere.com\n" \
"IT: git config --get user.email; 0; bogous@somewhere.com\n" \
+"IT: which git; 1; '/usr/bin/which: no git in (path1:path2:path3)'\n" \
,
\
Expand Down Expand Up @@ -2509,7 +2509,7 @@ def test_abort_gracefully_if_no_enables(self):
+"1) SERIAL_RELEASE => Skipped configure, build, test due to no enabled packages! => Does not affect push readiness!\n" \
+"MPI_DEBUG: Skipping sending build/test case email because there were no enables and --abort-gracefully-if-no-enables was set!\n"
+"SERIAL_RELEASE: Skipping sending build/test case email because there were no enables and --abort-gracefully-if-no-enables was set!\n"
+"There were no successfuly attempts to configure/build/test!\n" \
+"There were no successfully attempts to configure/build/test!\n" \
+"Skipping sending final email because there were no enables and --abort-gracefully-if-no-enables was set!\n" \
+"ABORTED DUE TO NO ENABLES: Trilinos:\n" \
+"REQUESTED ACTIONS: PASSED\n" \
Expand Down Expand Up @@ -3241,7 +3241,7 @@ def test_extra_repo_1_abort_gracefully_if_no_changes_to_push_passes(self):
"Pulling in packages from POST extra repos: preCopyrightTrilinos ...\n" \
+"Did not pull any changes from this repo!\n" \
+"No changes were pulled!\n" \
+"Not perfoming any build cases because there are no local changes to push" \
+"Not performing any build cases because there are no local changes to push" \
" and --abort-gracefully-if-no-changes-to-push!\n" \
+"Skipping sending final email because there are no local changes to push" \
" and --abort-gracefully-if-no-changes-to-push was set!\n" \
Expand Down Expand Up @@ -3880,7 +3880,7 @@ def test_enable_extra_packages(self):
"Full package enable list: \[Teuchos,RTOp,Thyra\]\n" \
)
# Above, the --enable-extra-packages option leave on the check of the modified
# files ahd just appends the set of enabled pacakges
# files ahd just appends the set of enabled packages


def test_disable_packages(self):
Expand Down Expand Up @@ -3953,7 +3953,7 @@ def test_enable_all_packages_auto(self):
"--enable-all-packages=auto",
"\-DTrilinos_ENABLE_ALL_PACKAGES:BOOL=ON\n",
modifiedFilesStr="CMakeLists.txt", # Will not trigger TrilinosFramework!
extraPassRegexStr="Modifed file: .CMakeLists.txt.\n"\
extraPassRegexStr="Modified file: .CMakeLists.txt.\n"\
+"Enabling all Trilinos packages!\n",
)

Expand Down Expand Up @@ -4725,7 +4725,7 @@ def test_st_extra_builds_ex_only_fail(self):
"ThyraCrazyStuff of type EX is being excluded because it is not in the valid list of package types .PT,ST.\n" \
+"passed: Trilinos/MPI_DEBUG: skipped configure, build, test due to no enabled packages\n" \
+"passed: Trilinos/MPI_DEBUG_ST: skipped configure, build, test due to no enabled packages\n" \
+"There were no successfuly attempts to configure/build/test!\n" \
+"There were no successfully attempts to configure/build/test!\n" \
+" => A PUSH IS .NOT. READY TO BE PERFORMED!\n" \
+"^PUSH FAILED\n" \
+"^REQUESTED ACTIONS: FAILED\n" \
Expand Down Expand Up @@ -5415,7 +5415,7 @@ def test_do_all_push_default_builds_mpi_debug_final_commit_fail(self):
+g_expectedCommonOptionsSummary \
+"A PUSH IS READY TO BE PERFORMED!\n" \
+"Final pull passed!\n" \
+"Attempting to amend the final commmit message ...\n" \
+"Attempting to amend the final commit message ...\n" \
+"Appending test results to last commit failed!\n" \
+"Not performing push due to prior errors!\n" \
+"AMEND COMMIT FAILED: Trilinos:\n" \
Expand Down Expand Up @@ -5625,9 +5625,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@somwhere.com\n" \
+"Running: mailx -s .FAILED: Trilinos/MPI_DEBUG: configure failed. bogous@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@somwhere.com\n" \
+"Running: mailx -s .FAILED CONFIGURE/BUILD/TEST: Trilinos: .* bogous@somewhere.com\n" \
)


Expand Down
2 changes: 1 addition & 1 deletion test/ci_support/DumpXmlDepsTests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ TRIBITS_ADD_ADVANCED_TEST( DepXmlDumpTests_DefaultProjectSourceDir

#####################################################################
#
# Unit tests for just creating the depencency XML files
# Unit tests for just creating the dependency XML files
#
#####################################################################

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

#
# Test out the TribitsExampleProject logic for changes requiring a global
# rebulid
# rebuild
#

class test_TribitsExampleProject_ProjectCiFileChangeLogic(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion test/core/CTestScriptsUnitTests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ FUNCTION(CTestScripts_fail_regular_exprssion_w_circular_ref_detection_tests)
TRIBITS_ADD_TEST( GenericDriver
NAME CTestScripts_fail_regular_exprssion_w_circular_ref_detection_2
POSTFIX_AND_ARGS_0 test1 "Some stuff\n\nThe following Teuchos::RCPNode objects were created\n\nsome other stuff" 0
FAIL_REGULAR_EXPRESSION "Some other bad outptut taht does not match"
FAIL_REGULAR_EXPRESSION "Some other bad outptut that does not match"
WILL_FAIL
NUM_MPI_PROCS 1
)
Expand Down
2 changes: 1 addition & 1 deletion test/core/DependencyUnitTests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ CREATE_DEPENDENCY_HANDLING_TEST_CASE(
"Error, the package 'Anasazi' is listed as a dependency of the package"
"'Teko' is in the list 'Trilinos_SE_PACKAGES' but the package 'Anasazi' is"
"either not defined or is listed later in the package order[.] This may also"
"be an attempt to create a cicular dependency between the packages 'Anasazi'"
"be an attempt to create a circular dependency between the packages 'Anasazi'"
"and 'Teko' [(]which is not allowed[)][.] Check the spelling of 'Anasazi' or see"
"how it is listed in Trilinos_PACKAGES_AND_DIRS_AND_CLASSIFICATIONS in"
"relationship to 'Teko'[.]"
Expand Down
Loading

0 comments on commit c716a74

Please sign in to comment.