Skip to content

Commit

Permalink
Merge pull request #403 from gsjaardema/spelling-fixes
Browse files Browse the repository at this point in the history
Spelling fixes
  • Loading branch information
bartlettroscoe authored Aug 14, 2021
2 parents 576f455 + cd4bb0b commit 77dcbe4
Show file tree
Hide file tree
Showing 138 changed files with 446 additions and 448 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tribits_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
workflow_dispatch:
inputs:
ctest_build_name_suffix:
description: 'Add a suffix to bulid names on CDash'
description: 'Add a suffix to build names on CDash'
required: false
jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions cmake/ctest/github_actions/run_github_actions_ctest_driver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# NOTE: This will create the subdir 'tribits-build' under $PWD if that
# directory does not already exist. But it will not delete an existing
# directly 'tribits-build' if it already exists (but that is usually fine to
# do rebulids).
# do rebuilds).
#
# NOTE: One can control various behaviors and other options as documented with
# tribits_ctest_driver() including not submitting to CDash to do testing
Expand All @@ -40,7 +40,7 @@
# env CTEST_DO_SUBMIT=OFF <this-dir>/run_github_actions_ctest_driver.sh [options]
#

# Get locaiton of TriBITS and this dir under TriBITS
# Get location of TriBITS and this dir under TriBITS
if [[ "$TRIBITS_BASE_DIR" == "" ]] ; then
_ABS_FILE_PATH=`readlink -f $0`
THIS_BASE_DIR=`dirname $_ABS_FILE_PATH`
Expand Down
2 changes: 1 addition & 1 deletion 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 Down
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 @@ -5487,7 +5487,7 @@ sub nested {
# http://www.csis.ul.ie/cobol/Course/COBOLIntro.htm
# Traditionally, comments in COBOL were indicated with an asteriks in
# Traditionally, comments in COBOL were indicated with an asterisk in
# the seventh column. Modern compilers may be more lenient.
pattern name => [qw /comment COBOL/],
create => '(?<=^......)(?k:(?k:[*])(?k:[^\n]*)(?k:\n))',
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
2 changes: 1 addition & 1 deletion common_tools/test/monitor-disk-usage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ hostname=`hostname -f`

CURRENT=$(df ${partition} | grep ${partition} | awk '{ print $5}' | sed 's/%//g')

usage_str="${hostname}:${partition} ${CURRENT}% full, threashold ${percentage_usage_warn}%"
usage_str="${hostname}:${partition} ${CURRENT}% full, threshold ${percentage_usage_warn}%"

df_h_output=$(df -h ${partition})

Expand Down
6 changes: 3 additions & 3 deletions dev_testing/cee-rhel7/do-configure-mpi-debug
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@ ${TRIBITS_BASE_DIR}/dev_testing/generic/do-configure-mpi-debug \
#
# -DTriBITS_CTEST_DRIVER_SUBMIT_TO=EXP_CDASH

# To submot to arbitary CDash site (e.g. testing-dev.sandia.gov/cdash) set:
# To submot to arbitrary CDash site (e.g. testing-dev.sandia.gov/cdash) set:
#
# -DTriBITS_CTEST_DRIVER_SUBMIT_TO=CUSTOM
# -DTriBITS_CTEST_DRIVER_SUBMIT_DROP_SITE=testing-dev.sandia.gov
# -DTriBITS_CTEST_DRIVER_SUBMIT_DROP_LOCATION="/cdash/submit.php?project=TribitsExProj"

# NOTE: Add -DTriBITS_ENABLE_REAL_GIT_CLONE_TESTS=ON to test cloning TriBITS
# Exmaple repos and testing the clone features of the various tools. To get
# Example repos and testing the clone features of the various tools. To get
# this to work on SNL machines, one may need to switch from
# 'https://github.com/' to '[email protected]:' using:
#
# export [email protected]:tribits/
#
# before configuring.
#
# NOTE: The directrory /tmp/tribits_install_tests above was created beforehand with:
# NOTE: The directory /tmp/tribits_install_tests above was created beforehand with:
#
# $ /home/atdm-devops-admin/tools/run-as-atdm-devops-admin mkdir /tmp/tribits_install_tests
# $ /home/atdm-devops-admin/tools/run-as-atdm-devops-admin chgrp wg-run-as-atdm-devops /tmp/tribits_install_tests
Expand Down
2 changes: 1 addition & 1 deletion dev_testing/cee-rhel7/load-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module load sems-cmake/3.17.1
module load sems-git/2.10.1

# Make default install permissions 700 so that we can test that TriBITS will
# use recusive chmod to open up permissions.
# use recursive chmod to open up permissions.
umask g-rwx,o-rwx

export [email protected]:tribits/
2 changes: 1 addition & 1 deletion dev_testing/crf450/load-env-python-2.7.5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module load sems-ninja_fortran/1.10.0
export PATH=/home/vera_env/common_tools/ccache-3.7.9/bin:${PATH}

# Make default install permissions 700 so that we can test that TriBITS will
# use recusive chmod to open up permissions.
# use recursive chmod to open up permissions.
umask g-rwx,o-rwx

export [email protected]:tribits/
2 changes: 1 addition & 1 deletion dev_testing/crf450/load-env-python-3.5.2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export PATH=$HOME/bin/python-3.5.2:$PATH
export PATH=/home/vera_env/common_tools/ccache-3.7.9/bin:${PATH}

# Make default install permissions 700 so that we can test that TriBITS will
# use recusive chmod to open up permissions.
# use recursive chmod to open up permissions.
umask g-rwx,o-rwx

export [email protected]:tribits/
2 changes: 1 addition & 1 deletion test/ci_support/CDashQueryAnalyzeReportUnitTestHelpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def assertFindListOfStringsInString(
"Error, could not find string '"+stringToFind+"' in '"+stringToSearchVarName+"'!")


# Search for a string in a list of stirngs
# Search for a string in a list of strings
def assertFindStringInListOfStrings(
testObj,
stringToFind,
Expand Down
30 changes: 15 additions & 15 deletions test/ci_support/CDashQueryAnalyzeReport_UnitTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ def test_too_few_required_headers_fail(self):
" or optional column headers '[]'!"
)
if not threwException:
self.assertFalse("ERROR: Did not thown an excpetion")
self.assertFalse("ERROR: Did not throw an exception")

def test_too_many_required_headers_fail(self):
csvFileStr=\
Expand All @@ -623,7 +623,7 @@ def test_too_many_required_headers_fail(self):
" 'col_3' is missing from the set of included column headers"+\
" '['col_0', 'col_1', 'col_2']'!" )
if not threwException:
self.assertFalse("ERROR: Did not thown an excpetion")
self.assertFalse("ERROR: Did not throw an exception")

def test_wrong_required_col_0_fail(self):
csvFileStr=\
Expand Down Expand Up @@ -665,7 +665,7 @@ def test_col_3_row_2_bad_row_len_fail(self):
" ['val_10', 'val_11', 'val_12', 'extra'] has 4 entries"+\
" which does not macth the number of column headers 3!" )
if not threwException:
self.assertFalse("ERROR: Did not thown an excpetion")
self.assertFalse("ERROR: Did not throw an exception")

def test_col_3_row_0_required_cols_pass(self):
csvFileStr=\
Expand All @@ -689,7 +689,7 @@ def test_empty_csv_file_with_required_fields_fail(self):
self.assertEqual( str(errMsg),
"Error, CSV file '"+csvFileName+"' is empty which is not allowed!" )
if not threwException:
self.assertFalse("ERROR: Did not thown an excpetion")
self.assertFalse("ERROR: Did not throw an exception")


#############################################################################
Expand Down Expand Up @@ -847,7 +847,7 @@ def test_invalid(self):
self.assertEqual( str(errMsg),
"Error, testsetAcro = 'invalid' is not supported!" )
if not threwExcept:
self.assertFalse("ERROR: Did not thown an excpetion")
self.assertFalse("ERROR: Did not throw an exception")



Expand Down Expand Up @@ -891,7 +891,7 @@ def test_invalid(self):
" status = 'Passed' and issue_tracker = 'None'"+\
" is not a supported test-set type!" )
if not threwExcept:
self.assertFalse("ERROR: Did not thown an excpetion")
self.assertFalse("ERROR: Did not throw an exception")


#############################################################################
Expand Down Expand Up @@ -2442,7 +2442,7 @@ def test_nonpassingTest_downloadFromCDash(self):
self.assertEqual(testDict['issue_tracker'], '#1234')
self.assertEqual(testDict['issue_tracker_url'], 'some.com/site/issue/1234')

# Check for the existance of the created Cache file
# Check for the existence of the created Cache file
cacheFile = \
testCacheOutputDir+"/2001-01-01-site_name-build_name-test_name-HIST-5.json"
self.assertEqual(os.path.exists(testCacheOutputDir), True)
Expand Down Expand Up @@ -2554,7 +2554,7 @@ def test_mdt_nonpassingTest_downloadFromCDash(self):
self.assertEqual(testDict['issue_tracker'], '#1234')
self.assertEqual(testDict['issue_tracker_url'], 'some.com/site/issue/1234')

# Check for the existance of the created Cache file
# Check for the existence of the created Cache file
cacheFile = \
testCacheOutputDir+"/2001-01-01-site_name-build_name-test_name-HIST-5.json"
self.assertEqual(os.path.exists(testCacheOutputDir), True)
Expand Down Expand Up @@ -2942,7 +2942,7 @@ def test_mismatch_top_test_history_status_allowed(self):
# Create dummy test history
testHistoryLOD = getTestHistoryLOD5(
[
'Failed', # This test got filtered out of the global lsit of nonpassing tests
'Failed', # This test got filtered out of the global list of nonpassing tests
'Failed',
'Passed',
'Passed',
Expand Down Expand Up @@ -3618,7 +3618,7 @@ def test_1x1_bad_key_fail(self):
rowDataList = [ {'key1':'data1'} ]
try:
htmlTable = createHtmlTableStr("Title", colDataList, rowDataList)
self.assertEqual("Excpetion did not get thrown!", "No it did not!")
self.assertEqual("Exception did not get throw!", "No it did not!")
except Exception as errMsg:
self.assertEqual(str(errMsg),
"Error, column 0 dict key='badKey' row 0 entry is 'None' which is"+\
Expand Down Expand Up @@ -4071,7 +4071,7 @@ def test_missing_issue_tracker_field(self):
"Error, the test dict {"+stru()+"'testname': "+stru()+"'test2'} at index 1"+\
" is missing the 'issue_tracker' field!" )
if not threwExcept:
self.assertFalse("ERROR: Did not thown an excpetion")
self.assertFalse("ERROR: Did not throw an exception")


def test_missing_issue_tracker_url_field(self):
Expand All @@ -4090,7 +4090,7 @@ def test_missing_issue_tracker_url_field(self):
" {"+stru()+"'issue_tracker': "+stru()+"'#1234', "+stru()+"'testname': "+stru()+"'test2'} at index 1"+\
" is missing the 'issue_tracker_url' field!" )
if not threwExcept:
self.assertFalse("ERROR: Did not thown an excpetion")
self.assertFalse("ERROR: Did not throw an exception")


def test_inconsistent_issue_tracker_field(self):
Expand All @@ -4110,7 +4110,7 @@ def test_inconsistent_issue_tracker_field(self):
" index 1 has a different 'issue_tracker' field '#1235' than the expected"+\
" value of '#1234'!" )
if not threwExcept:
self.assertFalse("ERROR: Did not thown an excpetion")
self.assertFalse("ERROR: Did not throw an exception")


def test_inconsistent_issue_tracker_field(self):
Expand All @@ -4132,7 +4132,7 @@ def test_inconsistent_issue_tracker_field(self):
" 'https://github.com/org/repo/issues/1236' than the expected value of"+\
" 'https://github.com/org/repo/issues/1234'!" )
if not threwExcept:
self.assertFalse("ERROR: Did not thown an excpetion")
self.assertFalse("ERROR: Did not throw an exception")


#def test_inconsistent_issue_tracker_url_field(self):
Expand Down Expand Up @@ -4206,7 +4206,7 @@ def test_non_matching_issue_tracker_field(self):
debugPrint=False,
)
if not threwExcept:
self.assertFalse("ERROR: Did not thown an excpetion")
self.assertFalse("ERROR: Did not throw an exception")


def test_twif_8_twinr_1(self):
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
Loading

0 comments on commit 77dcbe4

Please sign in to comment.