Skip to content

Commit

Permalink
Merge bitcoin#24762: lint: Start to use py lint scripts
Browse files Browse the repository at this point in the history
fae211c lint: Start to use py lint scripts (MarcoFalke)
fa82e89 Move lint script and data file to avoid lint- prefix (MarcoFalke)

Pull request description:

ACKs for top commit:
  fjahr:
    tACK fae211c

Tree-SHA512: f8272a1bab9efb8203cac121710baae68f01f79e520ad71ff15aa516d19763d61c088b411b019de105a6a30e7ee3c274814d59963f6ac22ba1084560fb601f45
  • Loading branch information
MarcoFalke authored and knst committed May 15, 2024
1 parent 85013e9 commit f226e8d
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 12 deletions.
4 changes: 2 additions & 2 deletions test/lint/lint-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
#
# This script runs all contrib/devtools/lint-*.sh files, and fails if any exit
# This script runs all contrib/devtools/lint-* files, and fails if any exit
# with a non-zero status code.

# This script is intentionally locale dependent by not setting "export LC_ALL=C"
Expand All @@ -19,7 +19,7 @@ LINTALL=$(basename "${BASH_SOURCE[0]}")
EXIT_CODE=0

if ! command -v parallel > /dev/null; then
for f in "${SCRIPTDIR}"/lint-*.sh; do
for f in "${SCRIPTDIR}"/lint-*; do
if [ "$(basename "$f")" != "$LINTALL" ]; then
if ! "$f"; then
echo "^---- failure generated from $f"
Expand Down
3 changes: 3 additions & 0 deletions test/lint/lint-files.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from subprocess import check_output
from typing import Optional, NoReturn

CMD_TOP_LEVEL = ["git", "rev-parse", "--show-toplevel"]
CMD_ALL_FILES = "git ls-files -z --full-name"
CMD_SOURCE_FILES = 'git ls-files -z --full-name -- "*.[cC][pP][pP]" "*.[hH]" "*.[pP][yY]" "*.[sS][hH]"'
CMD_SHEBANG_FILES = "git grep --full-name --line-number -I '^#!'"
Expand Down Expand Up @@ -184,6 +185,8 @@ def check_shebang_file_permissions() -> int:


def main() -> NoReturn:
root_dir = check_output(CMD_TOP_LEVEL).decode("utf8").strip()
os.chdir(root_dir)
failed_tests = 0
failed_tests += check_all_filenames()
failed_tests += check_source_filenames()
Expand Down
7 changes: 0 additions & 7 deletions test/lint/lint-files.sh

This file was deleted.

4 changes: 2 additions & 2 deletions test/lint/lint-format-strings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ FUNCTION_NAMES_AND_NUMBER_OF_LEADING_ARGUMENTS=(
)

EXIT_CODE=0
if ! python3 -m doctest test/lint/lint-format-strings.py; then
if ! python3 -m doctest "test/lint/run-lint-format-strings.py"; then
EXIT_CODE=1
fi
for S in "${FUNCTION_NAMES_AND_NUMBER_OF_LEADING_ARGUMENTS[@]}"; do
IFS="," read -r FUNCTION_NAME SKIP_ARGUMENTS <<< "${S}"
for MATCHING_FILE in $(git grep --full-name -l "${FUNCTION_NAME}" -- "*.c" "*.cpp" "*.h" | sort | grep -vE "^src/(dashbls|leveldb|secp256k1|tinyformat|univalue|test/fuzz/strprintf.cpp)"); do
MATCHING_FILES+=("${MATCHING_FILE}")
done
if ! test/lint/lint-format-strings.py --skip-arguments "${SKIP_ARGUMENTS}" "${FUNCTION_NAME}" "${MATCHING_FILES[@]}"; then
if ! "test/lint/run-lint-format-strings.py" --skip-arguments "${SKIP_ARGUMENTS}" "${FUNCTION_NAME}" "${MATCHING_FILES[@]}"; then
EXIT_CODE=1
fi
done
Expand Down
2 changes: 1 addition & 1 deletion test/lint/lint-spelling.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if ! command -v codespell > /dev/null; then
exit 0
fi

IGNORE_WORDS_FILE=test/lint/lint-spelling.ignore-words.txt
IGNORE_WORDS_FILE="test/lint/spelling.ignore-words.txt"
if ! codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=${IGNORE_WORDS_FILE} $(git ls-files -- ":(exclude)build-aux/m4/" ":(exclude)contrib/seeds/*.txt" ":(exclude)depends/" ":(exclude)doc/release-notes/" ":(exclude)src/bip39_english.h" ":(exclude)src/dashbls/" ":(exclude)src/crc32c/" ":(exclude)src/crypto/" ":(exclude)src/ctpl_stl.h" ":(exclude)src/cxxtimer.hpp" ":(exclude)src/util/expected.h" ":(exclude)src/immer/" ":(exclude)src/leveldb/" ":(exclude)src/qt/locale/" ":(exclude)src/qt/*.qrc" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)contrib/builder-keys/" ":(exclude)contrib/guix/patches"); then
echo "^ Warning: codespell identified likely spelling errors. Any false positives? Add them to the list of ignored words in ${IGNORE_WORDS_FILE}"
fi
File renamed without changes.
File renamed without changes.

0 comments on commit f226e8d

Please sign in to comment.