Changeset 66049 in vbox

Timestamp:

Mar 10, 2017 6:17:08 PM (8 years ago)

Author:

vboxsync

Message:

HostDrivers/Makefile.kmk: Moved the linux kernel module 'check' rule from installer to host drivers and cleaned it up. (untested)

Location:

trunk/src/VBox

Files:

• HostDrivers/Makefile.kmk (modified) (1 diff)
• Installer/linux/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -56 +56 @@
 endif # !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_VALIDATIONKIT)
 
+
+#
+# Build test for the linux host kernel modules.
+#
+if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_SDK) && "$(KBUILD_TARGET)" == "linux"
+ 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) \
+                $$(VBoxNetFlt-src_2_STAGE_TARGETS) \
+                $$(VBoxPci-src_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"
+
+endif
+
+
 # Let kBuild generate the rules.
 include $(FILE_KBUILD_SUB_FOOTER)

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

@@ -29 +29 @@
 ifneq ($(KBUILD_HOST),linux)
  $(error "The Linux installer can only be built on Linux!")
-endif
-
-#
-# Build test for the host kernel modules
-#
-
-ifdef VBOX_WITH_TESTCASES
- ifndef VBOX_ONLY_SDK
-  VBOX_LNX_MOD_TEST=$(PATH_TARGET)/tsthost_mod
-  VBOX_LNX_MOD_TEST_TARGET=$(PATH_TARGET)/tsthost_mod.run
-  VBOX_LNX_MOD_SOURCES=$(vboxdrv-mod_2_INST_TARGETS) $(VBoxNetFlt-src_2_INST_TARGETS) $(VBoxNetFlt-src_2_INST_TARGETS) $(VBoxPci-src_2_INST_TARGETS)
-  TESTING += $(VBOX_LNX_MOD_TEST_TARGET)
-  OTHERS += $(VBOX_LNX_MOD_TEST_TARGET)
-  OTHER_CLEAN += $(VBOX_LNX_MOD_TEST)
-$$(VBOX_LNX_MOD_TEST_TARGET): $$(VBOX_LNX_MOD_SOURCES)
-        $(QUIET)$(call MSG_L1,Doing a test build of the host kernel modules)
-        $(QUIET)$(ASH) -c "rm -f $@"
-        $(QUIET)$(ASH) -c "mkdir -p $(VBOX_LNX_MOD_TEST) && cp -r $(PATH_STAGE_BIN)/src/* $(VBOX_LNX_MOD_TEST)"
-        $(QUIET)$(ASH) -c "cd $(VBOX_LNX_MOD_TEST) && make"
-        $(QUIET)$(APPEND) -t "$@" "done"
- endif
 endif