diff options
| -rwxr-xr-x | bin/module-deps.pl | 13 | ||||
| -rw-r--r-- | test/Library_test_setupvcl.mk (renamed from test/Library_test-setupvcl.mk) | 0 | ||||
| -rw-r--r-- | test/Module_test.mk | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/bin/module-deps.pl b/bin/module-deps.pl index b99072213e3a..abec124e4abb 100755 --- a/bin/module-deps.pl +++ b/bin/module-deps.pl @@ -234,11 +234,16 @@ sub collapse_lib_to_module($) my @empty; $digraph{$name}{deps} = \@empty; $digraph{$name}{target} = $result->{target}; - $digraph{$name}{merged} = $result->{merged}; + $digraph{$name}{merged} = $result->{merged}; } } for my $dep (@{$result->{deps}}) { - $dep = $l2m->{$dep}; + my $newdep; + $newdep = $l2m->{$dep}; + + die "Mis-named */Library_*.mk file - should match rules: '$dep'" if (!defined $newdep); + $dep = $newdep; + # ignore: two libraries from the same module depend on each other next if ($name eq $dep); if (exists($digraph{$name})) @@ -257,7 +262,7 @@ sub collapse_lib_to_module($) push @deps, $dep; $digraph{$name}{deps} = \@deps; $digraph{$name}{target} = $result->{target}; - $digraph{$name}{merged} = $result->{merged}; + $digraph{$name}{merged} = $result->{merged}; } } } @@ -299,7 +304,7 @@ sub annotate_mergelibs($) for my $name (keys %{$tree}) { if (defined $merged_libs{$name}) { $tree->{$name}->{merged} = 1; - print STDERR "mark $name as merged\n"; +# print STDERR "mark $name as merged\n"; } } } diff --git a/test/Library_test-setupvcl.mk b/test/Library_test_setupvcl.mk index dd48ad813758..dd48ad813758 100644 --- a/test/Library_test-setupvcl.mk +++ b/test/Library_test_setupvcl.mk diff --git a/test/Module_test.mk b/test/Module_test.mk index 5e9bb15dacb7..e1051f16b5a0 100644 --- a/test/Module_test.mk +++ b/test/Module_test.mk @@ -13,7 +13,7 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,test,\ Library_test \ - Library_test-setupvcl \ + Library_test_setupvcl \ Library_subsequenttest \ Library_vclbootstrapprotector \ Package_unittest \ |