From ba4b2bffebb37afd95144f53ab1e1e08b55caefc Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Wed, 3 Jul 2024 11:12:51 -0700 Subject: [PATCH] make: Include tools/mod when checking dependency versions As tools/mod is not part of the test library's modules, the check to verify consistent dependency versions ignored it. Explicitly get the dependencies from this module when running verify-dep. Signed-off-by: Ivan Valdes --- scripts/test.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/test.sh b/scripts/test.sh index d142dd21c..9e390466a 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -541,7 +541,14 @@ function dump_deps_of_module() { # Checks whether dependencies are consistent across modules function dep_pass { local all_dependencies + local tools_mod_dependencies all_dependencies=$(run_for_modules dump_deps_of_module | sort) || return 2 + # tools/mod is a special case. It is a module that is not included in the + # module list from test_lib.sh. However, we need to ensure that the + # dependency versions match the rest of the project. Therefore, explicitly + # execute the command for tools/mod, and append its dependencies to the list. + tools_mod_dependencies=$(run_for_module "tools/mod" dump_deps_of_module "./...") || return 2 + all_dependencies="${all_dependencies}"$'\n'"${tools_mod_dependencies}" local duplicates duplicates=$(echo "${all_dependencies}" | cut -d ',' -f 1,2 | sort | uniq | cut -d ',' -f 1 | sort | uniq -d) || return 2