forked from trilinos/Trilinos
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge 'trilinos/Trilinos:develop' (14d6270) into 'tcad-charon/Trilino…
…s:develop' (62508f2). * trilinos-develop: Tacho - disable tests for kokkos task scheduler TrilinosCouplings: More cleanup to Poisson2D driver MueLu: Avoid throwing exceptions in smoother construction MueLu RefMaxwell: Copy D0 matrix ATDM: Remove some duplicate asserts found in review (trilinos#5939) Fix capitalization of Kokkos_ENABLE_CUDA_RELOCATABLE_DEVICE_CODE in ShyLU dependencies. Update TrilinosFrameworkTests for addition of TrilinosATDMConfigTest package (trilinos#5939) ATDM: van1-tx2: Switch to atdm_match_any_buildname_keyword (trilinos#5939, CDOFA-27) ATDM: van1-tx2: Add unit tests for custom_builds.sh (CDOFA-72) Add TrilinosATDMConfigTests package (trilinos#5939) ATDM: Change to true keyword matching with unit tests for set_build_options.sh (trilinos#4063, trilinos#5939) Add atdm_match_any_keyword (trilinos#5939) Add atdm_match_keyword (trilinos#4063, trilinos#5939, ATDV-339) Allow 'default' to have stuff after it (trilinos#5939, ATDV-339) Automatic snapshot commit from shunit2 at ebc4baa Tacho - export crs matrix in external interface example
- Loading branch information
Showing
73 changed files
with
8,142 additions
and
222 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| TRIBITS_PACKAGE(TrilinosATDMConfigTests) | ||
| TRIBITS_ADD_TEST_DIRECTORIES(test) | ||
| TRIBITS_ADD_TEST_DIRECTORIES(van1-tx2) | ||
| TRIBITS_PACKAGE_POSTPROCESS() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| TRIBITS_PACKAGE_DEFINE_DEPENDENCIES() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ADD_SUBDIRECTORY(unit_tests) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| #!/bin/sh | ||
| # | ||
| # A generic git hook proxy. | ||
| # https://git-scm.com/docs/githooks | ||
|
|
||
| run() { | ||
| hook=$1 | ||
| file=$2 | ||
|
|
||
| n=$(echo "${file}" |sed "s/^.*${hook}\.//") | ||
| echo "running ${n} ${hook}" | ||
| ${file} | ||
| } | ||
|
|
||
| die() { | ||
| hook=$1 | ||
| echo "${hook} hook did not succeed" >&2 | ||
| exit 1 | ||
| } | ||
|
|
||
| # Redirect output to stderr. | ||
| exec 1>&2 | ||
|
|
||
| githooks='.githooks' | ||
| basename=$(basename "$0") | ||
|
|
||
| for f in $(cd ${githooks} && echo *); do | ||
| case "${f}" in | ||
| ${basename}.*) | ||
| run ${basename} "${githooks}/${f}" || die "${f}" | ||
| ;; | ||
| esac | ||
| done |
41 changes: 41 additions & 0 deletions
41
cmake/std/atdm/test/shunit2/.githooks/pre-commit.shellcheck
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| #!/bin/sh | ||
| # | ||
| # Git hook to run ShellCheck. | ||
| # | ||
| # ShellCheck <https://www.shellcheck.net/> | ||
|
|
||
| # Treat unset variables as an error when performing parameter expansion. | ||
| set -u | ||
|
|
||
| TRUE=0 | ||
| FALSE=1 | ||
|
|
||
| die() { | ||
| echo "$@" >&2 | ||
| exit 1 | ||
| } | ||
|
|
||
| if ! command -v shellcheck >/dev/null; then | ||
| echo 'unable to locate shellcheck' >&2 | ||
| return 0 | ||
| fi | ||
|
|
||
| success=${TRUE} | ||
| for f in $(git diff --cached --name-only); do | ||
| # Check for file deletion. | ||
| if [ ! -r "${f}" ]; then | ||
| continue | ||
| fi | ||
|
|
||
| cmd=':' | ||
| case "${f}" in | ||
| shflags|shflags_test_helpers) cmd="shellcheck -s sh ${f}" ;; | ||
| *.sh) cmd="shellcheck ${f}" ;; | ||
| esac | ||
| if ! ${cmd}; then | ||
| success=${FALSE} | ||
| echo "shellcheck error for '${f}'" >&2 | ||
| fi | ||
| done | ||
|
|
||
| exit ${success} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # Hidden files generated by macOS. | ||
| .DS_Store | ||
| ._* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| language: bash | ||
|
|
||
| env: | ||
| - SHUNIT_COLOR='always' | ||
|
|
||
| script: | ||
| # Execute the unit tests. | ||
| - ./test_runner | ||
|
|
||
| addons: | ||
| apt: | ||
| packages: | ||
| - ksh | ||
| - mksh | ||
| - zsh | ||
|
|
||
| matrix: | ||
| include: | ||
| - os: linux | ||
| # Support Ubuntu Bionic 18.04 through at least Apr 2023. | ||
| dist: bionic | ||
| - os: linux | ||
| # Support Ubuntu Xenial 16.04 through at least Apr 2021. | ||
| dist: xenial | ||
| - os: linux | ||
| # Support Ubuntu Trusty 14.04 through at least Apr 2019. | ||
| dist: trusty | ||
| - os: osx | ||
| - os: linux | ||
| script: | ||
| # Run the source through ShellCheck (http://www.shellcheck.net). | ||
| - shellcheck shunit2 *_test.sh | ||
| - shellcheck -s sh shunit2_test_helpers | ||
|
|
||
| branches: | ||
| only: | ||
| - master | ||
| - 2.1.x | ||
| # Tags, e.g. v.2.1.8. | ||
| - /^v\d+\.\d+(\.\d+)?(-\S*)?$/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| # Contributor Covenant Code of Conduct | ||
|
|
||
| ## Our Pledge | ||
|
|
||
| In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. | ||
|
|
||
| ## Our Standards | ||
|
|
||
| Examples of behavior that contributes to creating a positive environment include: | ||
|
|
||
| * Using welcoming and inclusive language | ||
| * Being respectful of differing viewpoints and experiences | ||
| * Gracefully accepting constructive criticism | ||
| * Focusing on what is best for the community | ||
| * Showing empathy towards other community members | ||
|
|
||
| Examples of unacceptable behavior by participants include: | ||
|
|
||
| * The use of sexualized language or imagery and unwelcome sexual attention or advances | ||
| * Trolling, insulting/derogatory comments, and personal or political attacks | ||
| * Public or private harassment | ||
| * Publishing others' private information, such as a physical or electronic address, without explicit permission | ||
| * Other conduct which could reasonably be considered inappropriate in a professional setting | ||
|
|
||
| ## Our Responsibilities | ||
|
|
||
| Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. | ||
|
|
||
| Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. | ||
|
|
||
| ## Scope | ||
|
|
||
| This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. | ||
|
|
||
| ## Enforcement | ||
|
|
||
| Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at kate.ward@forestent.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. | ||
|
|
||
| Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. | ||
|
|
||
| ## Attribution | ||
|
|
||
| This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] | ||
|
|
||
| [homepage]: http://contributor-covenant.org | ||
| [version]: http://contributor-covenant.org/version/1/4/ |
Oops, something went wrong.