Changeset 69528 in vbox for trunk

Timestamp:

Oct 30, 2017 5:35:16 PM (7 years ago)

Author:

vboxsync

Message:

Linux drivers: move module test build function to Config.kmk.
bugref:4567: Linux kernel driver maintenance

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/linux/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -4204 +4204 @@
 
 ifeq ($(KBUILD_TARGET),linux)
-TEMPLATE_VBOXR0DRV_TOOL                = $(NO_SUCH_VARIABLE)
+ TEMPLATE_VBOXR0DRV_TOOL                = $(NO_SUCH_VARIABLE)
+
+##
+# Using the extra expansion to replace $(module) before eval, thus everything
+# else needs escaped dollars.
+ define VBOX_LINUX_GENERATE_KMOD_TEST
+  VBOX_TARGET_$(module) = $$(PATH_TARGET)/tst$(module)_mod.run
+  TESTING      += $$(VBOX_TARGET_$(module))
+  OTHERS       += $$(VBOX_TARGET_$(module))
+  OTHERS_CLEAN += $$(VBOX_TARGET_$(module))
+  $$$$(VBOX_TARGET_$(module)): $$$$($(module)_2_STAGE_TARGETS)
+        $(QUIET)$$(call MSG_L1,Doing a test build of the $(module) kernel module)
+        $(QUIET)$$(RM) -f -- "$$@"
+        $(QUIET)$$(RM) -Rf -- "$$(PATH_TARGET)/tst$(module)_mod"
+        $(QUIET)$$(MKDIR) -p -- "$$(PATH_TARGET)/tst$(module)_mod"
+        $(QUIET)$$(CP) -R -- "$$(PATH_STAGE_BIN)/../$$($(module)_INST)" "$$(PATH_TARGET)/tst$(module)_mod/"
+        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $$(PATH_TARGET)/tst$(module)_mod clean
+        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $$(PATH_TARGET)/tst$(module)_mod
+        $(QUIET)$$(RM) -Rf -- $$(PATH_TARGET)/tst$(module)_mod
+        $(QUIET)$$(APPEND) -t "$$@" "done"
+ endef
+
 endif
 

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -361 +361 @@
  && !defined(VBOX_ONLY_VALIDATIONKIT) \
  && !defined(VBOX_WITHOUT_LINUX_TEST_BUILDS) \
+ && "$(KBUILD_TARGET)" == "linux" \
  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
 
- KBUILD_VERBOSE ?=
-
-##
-# Using the extra expansion to replace $(ver) before eval, thus everything
-# else needs escaped dollars.
- define def_vboxadd_mod_test
-  TESTING      += $$(PATH_TARGET)/tst$(module)_mod.run
-  OTHERS       += $$(PATH_TARGET)/tst$(module)_mod.run
-  OTHERS_CLEAN += $$(PATH_TARGET)/tst$(module)_mod.run
-  $$$$(PATH_TARGET)/tst$(module)_mod.run: $$$$($(module)-mod_2_STAGE_TARGETS)
-        $(QUIET)$$(call MSG_L1,Doing a test build of the $(module) kernel module)
-        $(QUIET)$$(RM) -f -- "$@"
-        $(QUIET)$$(RM) -Rf -- "$$(PATH_TARGET)/tst$(module)_mod"
-        $(QUIET)$$(MKDIR) -p -- "$$(PATH_TARGET)/tst$(module)_mod"
-        $(QUIET)$$(CP) -R -- "$$(PATH_STAGE_BIN)/additions/src/$(module)/" "$$(PATH_TARGET)/tst$(module)_mod/"
-        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $$(PATH_TARGET)/tst$(module)_mod clean
-        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $$(PATH_TARGET)/tst$(module)_mod
-        $(QUIET)$$(RM) -Rf -- $$(PATH_TARGET)/tst$(module)_mod
-        $(QUIET)$$(APPEND) -t "$$@" "done"
- endef
- $(foreach module, vboxguest vboxsf vboxvideo, $(eval $(def_vboxadd_mod_test)))
+ $(foreach module, vboxguest-mod vboxsf-mod vboxvideo-mod, $(eval $(VBOX_LINUX_GENERATE_KMOD_TEST)))
 
 endif

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -76 +76 @@
  && "$(KBUILD_TARGET)" == "linux" \
  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
- VBOX_LNX_MOD_TEST        = $(PATH_TARGET)/tsthost_mod
- VBOX_LNX_MOD_TEST_TARGET = $(PATH_TARGET)/tsthost_mod.run
- TESTING     += $(VBOX_LNX_MOD_TEST_TARGET)
- OTHERS      += $(VBOX_LNX_MOD_TEST_TARGET)
- OTHER_CLEAN += $(VBOX_LNX_MOD_TEST_TARGET)
- $$(VBOX_LNX_MOD_TEST_TARGET): \
-                $$(vboxdrv-mod_2_STAGE_TARGETS) \
-                $$(VBoxNetFlt-src_2_STAGE_TARGETS) \
-                $$(VBoxNetAdp-src_2_STAGE_TARGETS) \
-                $$(VBoxPci-src_2_STAGE_TARGETS) \
-                $$(HostDrivers-scripts_2_STAGE_TARGETS)
-        $(QUIET)$(call MSG_L1,Doing a test build of the host kernel modules)
-        $(QUIET)$(RM) -f -- "$@"
-        $(QUIET)$(RM) -Rf -- "$(VBOX_LNX_MOD_TEST)"
-        $(QUIET)$(MKDIR) -p -- "$(VBOX_LNX_MOD_TEST)"
-        $(QUIET)$(CP) -R -- "$(PATH_STAGE_BIN)/src/" "$(VBOX_LNX_MOD_TEST)/"
-        + $(QUIET)make -C $(VBOX_LNX_MOD_TEST) clean
-        + $(QUIET)make -C $(VBOX_LNX_MOD_TEST)
-        $(QUIET)$(RM) -Rf -- $(VBOX_LNX_MOD_TEST)
-        $(QUIET)$(APPEND) -t "$@" "done"
+
+ $(foreach module, vboxdrv-mod VBoxNetFlt-src VBoxNetAdp-src VBoxPci-src, $(eval $(VBOX_LINUX_GENERATE_KMOD_TEST)))
 
 endif