diff --git a/contrib/devtools/circular-dependencies.py b/contrib/devtools/circular-dependencies.py index b1d9f2b7db..983a5496b0 100755 --- a/contrib/devtools/circular-dependencies.py +++ b/contrib/devtools/circular-dependencies.py @@ -26,6 +26,7 @@ def module_name(path): return path if path.endswith(".h"): return path[:-2] + return path if path.endswith(".c"): return path[:-2] if path.endswith(".cpp"): diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py index e366a08bd2..8ac5c260ea 100755 --- a/test/lint/lint-circular-dependencies.py +++ b/test/lint/lint-circular-dependencies.py @@ -26,6 +26,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES = ( # Temporary, removed in followup https://github.com/bitcoin/bitcoin/pull/24230 "index/base -> node/context -> net_processing -> index/blockfilterindex -> index/base", ) +EXPECTED_CIRCULAR_DEPENDENCIES = () CODE_DIR = "src" @@ -48,6 +49,7 @@ def main(): ) for dependency_str in dependencies_output.stdout.rstrip().split("\n"): + if dependency_str == '': continue circular_dependencies.append( re.sub("^Circular dependency: ", "", dependency_str) )