Skip to content

Commit

Permalink
make: Include tools/mod when checking dependency versions
Browse files Browse the repository at this point in the history
Backport of ba4b2bf

Related issue: #18180

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: D Tripp <[email protected]>
  • Loading branch information
thedtripp committed Jul 4, 2024
1 parent f2b9662 commit 5727c64
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,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
Expand Down

0 comments on commit 5727c64

Please sign in to comment.