test: Refactor subtree exclusion in lint tests

bitcoin · Feb 26, 2024 · b4d7b7a · b4d7b7a
1 parent 1ac627c
commit b4d7b7a
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/test/lint/lint-ignore-dirs.txt b/test/lint/lint-ignore-dirs.txt
@@ -0,0 +1,4 @@
+leveldb
+crc32c
+secp256k1
+minisketch
diff --git a/test/lint/lint-include-guards.py b/test/lint/lint-include-guards.py
@@ -18,14 +18,14 @@
 
 EXCLUDE_FILES_WITH_PREFIX = ['contrib/devtools/bitcoin-tidy',
                              'src/crypto/ctaes',
-                             'src/leveldb',
-                             'src/crc32c',
-                             'src/secp256k1',
-                             'src/minisketch',
                              'src/tinyformat.h',
                              'src/bench/nanobench.h',
                              'src/test/fuzz/FuzzedDataProvider.h']
 
+with open('test/lint/lint-ignore-dirs.txt', 'r', encoding='utf-8') as file:
+    EXCLUDE_FILES_WITH_PREFIX += [f"src/{line.strip()}/" for line in file]
+
+
 
 def _get_header_file_lst() -> list[str]:
     """ Helper function to get a list of header filepaths to be

diff --git a/test/lint/lint-includes.py b/test/lint/lint-includes.py
@@ -14,13 +14,9 @@
 
 from subprocess import check_output, CalledProcessError
 
-
-EXCLUDED_DIRS = ["contrib/devtools/bitcoin-tidy/",
-                 "src/leveldb/",
-                 "src/crc32c/",
-                 "src/secp256k1/",
-                 "src/minisketch/",
-                ]
+EXCLUDED_DIRS = ["contrib/devtools/bitcoin-tidy/"]
+with open('test/lint/lint-ignore-dirs.txt', 'r', encoding='utf-8') as file:
+    EXCLUDED_DIRS += [f"src/{line.strip()}/" for line in file]
 
 EXPECTED_BOOST_INCLUDES = ["boost/date_time/posix_time/posix_time.hpp",
                            "boost/multi_index/detail/hash_index_iterator.hpp",

diff --git a/test/lint/lint-python-utf8-encoding.py b/test/lint/lint-python-utf8-encoding.py
@@ -12,11 +12,10 @@
 
 from subprocess import check_output, CalledProcessError
 
-EXCLUDED_DIRS = ["src/crc32c/", "src/secp256k1/"]
-
 
 def get_exclude_args():
-    return [":(exclude)" + dir for dir in EXCLUDED_DIRS]
+    with open('test/lint/lint-ignore-dirs.txt', 'r', encoding='utf-8') as file:
+        return [f":(exclude)src/{line.strip()}/" for line in file]
 
 
 def check_fileopens():

diff --git a/test/lint/lint-spelling.py b/test/lint/lint-spelling.py
@@ -11,8 +11,11 @@
 
 from subprocess import check_output, STDOUT, CalledProcessError
 
+with open('test/lint/lint-ignore-dirs.txt', 'r', encoding='utf-8') as file:
+    EXCLUDE_FILES = [f":(exclude)src/{line.strip()}/" for line in file]
+
 IGNORE_WORDS_FILE = 'test/lint/spelling.ignore-words.txt'
-FILES_ARGS = ['git', 'ls-files', '--', ":(exclude)build-aux/m4/", ":(exclude)contrib/seeds/*.txt", ":(exclude)depends/", ":(exclude)doc/release-notes/", ":(exclude)src/leveldb/", ":(exclude)src/crc32c/", ":(exclude)src/qt/locale/", ":(exclude)src/qt/*.qrc", ":(exclude)src/secp256k1/", ":(exclude)src/minisketch/", ":(exclude)contrib/guix/patches"]
+FILES_ARGS = ['git', 'ls-files', '--', ":(exclude)build-aux/m4/", ":(exclude)contrib/seeds/*.txt", ":(exclude)depends/", ":(exclude)doc/release-notes/", ":(exclude)src/qt/locale/", ":(exclude)src/qt/*.qrc", ":(exclude)contrib/guix/patches", ":(exclude)test/lint/lint-ignore-dirs.txt"] + EXCLUDE_FILES
 
 
 def check_codespell_install():

diff --git a/test/lint/lint-whitespace.py b/test/lint/lint-whitespace.py
@@ -18,13 +18,12 @@
 
 EXCLUDED_DIRS = ["depends/patches/",
                  "contrib/guix/patches/",
-                 "src/leveldb/",
-                 "src/crc32c/",
-                 "src/secp256k1/",
-                 "src/minisketch/",
                  "doc/release-notes/",
                  "src/qt/locale"]
 
+with open('test/lint/lint-ignore-dirs.txt', 'r', encoding='utf-8') as file:
+    EXCLUDED_DIRS += [f"src/{line.strip()}/" for line in file]
+
 def parse_args():
     """Parse command line arguments."""
     parser = argparse.ArgumentParser(