This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=6410d905bd5f491ca764debc2c25c44a4b561fe1 commit 6410d905bd5f491ca764debc2c25c44a4b561fe1 Author: Guillem Jover <guil...@debian.org> AuthorDate: Mon Jul 1 05:33:50 2024 +0200 test: Clarify the Makefile fragment variable being tested via comments The current output is very confusing as it does not really mention the actual variable being tested, and only expanded values are shown, which makes for a harder time when trying to diagnose issues in the tests. --- scripts/t/mk/architecture.mk | 4 ++-- scripts/t/mk/buildapi.mk | 1 + scripts/t/mk/buildflags.mk | 4 ++-- scripts/t/mk/buildopts.mk | 1 + scripts/t/mk/buildtools.mk | 4 ++-- scripts/t/mk/pkg-info.mk | 2 ++ scripts/t/mk/vendor-v0.mk | 1 + scripts/t/mk/vendor-v1.mk | 1 + scripts/t/mk/vendor.mk | 2 ++ 9 files changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/t/mk/architecture.mk b/scripts/t/mk/architecture.mk index fe79dc73f..295b80499 100644 --- a/scripts/t/mk/architecture.mk +++ b/scripts/t/mk/architecture.mk @@ -22,7 +22,7 @@ loop_targets := $(foreach machine,BUILD HOST TARGET,\ test: $(loop_targets) $(loop_targets): - : # Test the Make variable. + : # Test the $@ Make variable. test '$($@)' = '$(TEST_$@)' - : # Test the exported variable. + : # Test the $@ exported variable. test "$${$@}" = '$(TEST_$@)' diff --git a/scripts/t/mk/buildapi.mk b/scripts/t/mk/buildapi.mk index 08ff17e51..6ac92f9bc 100644 --- a/scripts/t/mk/buildapi.mk +++ b/scripts/t/mk/buildapi.mk @@ -9,4 +9,5 @@ test_vars := \ test: $(test_vars) $(test_vars): + : # Test $@ Make variable. test '$($@)' = '$(TEST_$@)' diff --git a/scripts/t/mk/buildflags.mk b/scripts/t/mk/buildflags.mk index ab5141ea1..74ccac04b 100644 --- a/scripts/t/mk/buildflags.mk +++ b/scripts/t/mk/buildflags.mk @@ -31,7 +31,7 @@ loop_targets := $(vars) $(vars:=_FOR_BUILD) test: $(loop_targets) $(loop_targets): - : # Test the Make variable. + : # Test the $@ Make variable. test '$($@)' = '$(TEST_$@)' - : # Test the exported variable. + : # Test the $@ exported variable. test "$${$@}" = '$(TEST_$@)' diff --git a/scripts/t/mk/buildopts.mk b/scripts/t/mk/buildopts.mk index eaf156346..a7cf2a369 100644 --- a/scripts/t/mk/buildopts.mk +++ b/scripts/t/mk/buildopts.mk @@ -7,4 +7,5 @@ test_vars := \ test: $(test_vars) $(test_vars): + : # Test the $@ Make variable. test '$($@)' = '$(TEST_$@)' diff --git a/scripts/t/mk/buildtools.mk b/scripts/t/mk/buildtools.mk index b3aaaefd2..745e03bc8 100644 --- a/scripts/t/mk/buildtools.mk +++ b/scripts/t/mk/buildtools.mk @@ -29,7 +29,7 @@ loop_targets := $(tools) $(tools:=_FOR_BUILD) test: $(loop_targets) $(loop_targets): - : # Test the Make variable. + : # Test the $@ Make variable. test '$($@)' = '$(TEST_$@)' - : # Test the exported variable. + : # Test the $@ exported variable. test "$${$@}" = '$(TEST_$@)' diff --git a/scripts/t/mk/pkg-info.mk b/scripts/t/mk/pkg-info.mk index bd578c06c..6eb37866d 100644 --- a/scripts/t/mk/pkg-info.mk +++ b/scripts/t/mk/pkg-info.mk @@ -18,7 +18,9 @@ test_vars := \ # EOL test: $(test_vars) + : # Test the SOURCE_DATE_EPOCH exported variable. test "$${SOURCE_DATE_EPOCH}" = '$(TEST_SOURCE_DATE_EPOCH)' $(test_vars): + : # Test the $@ Make variable. test '$($@)' = '$(TEST_$@)' diff --git a/scripts/t/mk/vendor-v0.mk b/scripts/t/mk/vendor-v0.mk index 602a8c63a..fbd0ba19c 100644 --- a/scripts/t/mk/vendor-v0.mk +++ b/scripts/t/mk/vendor-v0.mk @@ -3,4 +3,5 @@ dpkg_vendor_derives_from = $(dpkg_vendor_derives_from_v0) include $(srcdir)/mk/vendor.mk test: + : # Test the dpkg_vendor_derives_from v0 macro. test "$(shell $(call dpkg_vendor_derives_from,debian))" = "yes" diff --git a/scripts/t/mk/vendor-v1.mk b/scripts/t/mk/vendor-v1.mk index 11c1314ef..d46857062 100644 --- a/scripts/t/mk/vendor-v1.mk +++ b/scripts/t/mk/vendor-v1.mk @@ -3,4 +3,5 @@ include $(srcdir)/mk/vendor.mk dpkg_vendor_derives_from = $(dpkg_vendor_derives_from_v1) test: + : # Test the dpkg_vendor_derives_from v1 macro. test "$(call dpkg_vendor_derives_from,debian)" = "yes" diff --git a/scripts/t/mk/vendor.mk b/scripts/t/mk/vendor.mk index b77e88aba..9d89f0fee 100644 --- a/scripts/t/mk/vendor.mk +++ b/scripts/t/mk/vendor.mk @@ -9,7 +9,9 @@ test_vars := \ # EOL test: $(test_vars) + : # Test the dpkg_vendor_derives_from macro. test "$(shell $(call dpkg_vendor_derives_from,debian))" = "yes" $(test_vars): + : # Test $@ Make variable. test '$($@)' = '$(TEST_$@)' -- Dpkg.Org's dpkg
