Felix Singer submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved Felix Singer: Looks good to me, approved
tests: Rename Makefiles from .inc to .mk

The .inc suffix is confusing to various tools as it's not specific to
Makefiles. This means that editors don't recognize the files, and don't
open them with highlighting and any other specific editor functionality.

This issue is also seen in the release notes generation script where
Makefiles get renamed before running cloc.

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: Id09eafd293a54198aab87281f529749325df8b07
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80122
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
---
M tests/Makefile.common
M tests/Makefile.mk
R tests/acpi/Makefile.mk
R tests/commonlib/Makefile.mk
R tests/commonlib/bsd/Makefile.mk
R tests/console/Makefile.mk
R tests/device/Makefile.mk
R tests/drivers/Makefile.mk
R tests/lib/Makefile.mk
9 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile.common b/tests/Makefile.common
index e51d253..5cb7b25 100644
--- a/tests/Makefile.common
+++ b/tests/Makefile.common
@@ -42,7 +42,7 @@
TEST_INCLUDES += -I$(dir $(TEST_KCONFIG_AUTOHEADER))

# Note: This is intentionally just a subset of the warnings in the toplevel
-# Makefile.inc. We don't need to be as strict with test code, and things like
+# Makefile.mk. We don't need to be as strict with test code, and things like
# -Wmissing-prototypes just make working with the test framework cumbersome.
# Only put conservative warnings here that really detect code that's obviously
# unintentional.
@@ -95,7 +95,7 @@
$(1)-config-file := $(testobj)/$(1)/config.h
$$($(1)-config-file): $(TEST_KCONFIG_AUTOHEADER)
mkdir -p $$(dir $$@)
- printf '// File generated by tests/Makefile.inc\n// Do not change\n' > $$@
+ printf '// File generated by tests/Makefile.mk\n// Do not change\n' > $$@
printf '#include <%s>\n\n' "$(notdir $(TEST_KCONFIG_AUTOHEADER))" >> $$@
for kv in $$($(1)-config); do \
key="`echo $$$$kv | cut -d '=' -f -1`"; \
diff --git a/tests/Makefile.mk b/tests/Makefile.mk
index 584b4c0..f838f83 100644
--- a/tests/Makefile.mk
+++ b/tests/Makefile.mk
@@ -44,7 +44,7 @@
$(eval $(1)$(2)-stage := $(if $($(1)$(2)-stage),$($(1)$(2)-stage),ramstage))
$(if $(findstring $($(1)$(2)-stage), $(stages)),,
$(error Wrong $(1)$(2)-stage value $($(1)$(2)-stage). \
- Check your $(dir $(1)$(2))Makefile.inc))
+ Check your $(dir $(1)$(2))Makefile.mk))
endef

$(call add-special-class, tests)
diff --git a/tests/acpi/Makefile.inc b/tests/acpi/Makefile.mk
similarity index 100%
rename from tests/acpi/Makefile.inc
rename to tests/acpi/Makefile.mk
diff --git a/tests/commonlib/Makefile.inc b/tests/commonlib/Makefile.mk
similarity index 100%
rename from tests/commonlib/Makefile.inc
rename to tests/commonlib/Makefile.mk
diff --git a/tests/commonlib/bsd/Makefile.inc b/tests/commonlib/bsd/Makefile.mk
similarity index 100%
rename from tests/commonlib/bsd/Makefile.inc
rename to tests/commonlib/bsd/Makefile.mk
diff --git a/tests/console/Makefile.inc b/tests/console/Makefile.mk
similarity index 100%
rename from tests/console/Makefile.inc
rename to tests/console/Makefile.mk
diff --git a/tests/device/Makefile.inc b/tests/device/Makefile.mk
similarity index 100%
rename from tests/device/Makefile.inc
rename to tests/device/Makefile.mk
diff --git a/tests/drivers/Makefile.inc b/tests/drivers/Makefile.mk
similarity index 100%
rename from tests/drivers/Makefile.inc
rename to tests/drivers/Makefile.mk
diff --git a/tests/lib/Makefile.inc b/tests/lib/Makefile.mk
similarity index 100%
rename from tests/lib/Makefile.inc
rename to tests/lib/Makefile.mk

To view, visit change 80122. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Id09eafd293a54198aab87281f529749325df8b07
Gerrit-Change-Number: 80122
Gerrit-PatchSet: 5
Gerrit-Owner: Martin L Roth <gaumless@gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot@felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Gerrit-Reviewer: Jakub Czapiga <czapiga@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged