Skip to content

Commit

Permalink
partial bitcoin#25288: Reliably don't start itself (lint-all.py runs …
Browse files Browse the repository at this point in the history
…all tests twice)

excluded:
- f26a496 (change in glob pattern)

We still have shell scripts that end in `.sh`, so we can't
restrict the glob to only cover files that end in `.py`.
  • Loading branch information
kwvg committed Dec 4, 2024
1 parent bda1e03 commit 2fa480a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ci/dash/build_src.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if [ "$CHECK_DOC" = 1 ]; then
# TODO: Check docs (re-enable after all Bitcoin PRs have been merged and docs fully fixed)
#test/lint/check-doc.py
# Run all linters
test/lint/lint-all.py
test/lint/all-lint.py
fi

ccache --zero-stats --max-size=$CCACHE_SIZE
Expand Down
2 changes: 1 addition & 1 deletion ci/lint/06_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test/lint/git-subtree-check.sh src/minisketch
test/lint/git-subtree-check.sh src/univalue
test/lint/git-subtree-check.sh src/leveldb
test/lint/check-doc.py
test/lint/lint-all.py
test/lint/all-lint.py

if [ "$CIRRUS_REPO_FULL_NAME" = "dashpay/dash" ] && [ -n "$CIRRUS_CRON" ]; then
git log --merges --before="2 days ago" -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit
Expand Down
2 changes: 1 addition & 1 deletion test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ test/lint/lint-files.py
You can run all the shell-based lint tests by running:

```
test/lint/lint-all.py
test/lint/all-lint.py
```

# Writing functional tests
Expand Down
2 changes: 1 addition & 1 deletion test/lint/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ To do so, add the upstream repository as remote:
git remote add --fetch secp256k1 https://github.com/bitcoin-core/secp256k1.git
```

lint-all.py
all-lint.py
===========
Calls other scripts with the `lint-` prefix.
2 changes: 1 addition & 1 deletion test/lint/lint-all.py → test/lint/all-lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

exit_code = 0
mod_path = Path(__file__).parent
lints = [x for x in glob(f"{mod_path}/lint-*") if x != __file__]
lints = glob(f"{mod_path}/lint-*")
if which("parallel") and which("column"):
logfile = "parallel_out.log"
command = ["parallel", "--jobs", "100%", "--will-cite", "--joblog", logfile, ":::"] + lints
Expand Down

0 comments on commit 2fa480a

Please sign in to comment.