Changeset 66035 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 10, 2017 1:43:46 PM (8 years ago)

Author:

vboxsync

Message:

add/linux/Makefile.kmk: Moved 'check' target to more appropriate place.

File:

• trunk/src/VBox/Additions/linux/Makefile.kmk (modified) (2 diffs)

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

@@ -27 +27 @@
  include $(PATH_SUB_CURRENT)/lightdm-greeter/Makefile.kmk
 endif
-
-#
-# Build test for the Guest Additions kernel modules
-#
-
-ifdef VBOX_WITH_TESTCASES
- ifndef VBOX_ONLY_SDK
-  VBOX_LNX_ADD_TEST        = $(PATH_TARGET)/tstguest_mod
-  VBOX_LNX_ADD_TEST_TARGET = $(PATH_TARGET)/tstguest_mod.run
-  TESTING     += $(VBOX_LNX_ADD_TEST_TARGET)
-  OTHERS      += $(VBOX_LNX_ADD_TEST_TARGET)
- $$(VBOX_LNX_ADD_TEST_TARGET): \
-                $$(vboxguest-src_2_STAGE_TARGETS) \
-                $$(vboxsf-mod_2_STAGE_TARGETS) \
-                $$(vboxvideo_drm-mod_2_STAGE_TARGETS) \
-                $$(GuestDrivers-src_2_STAGE_TARGETS)
-        $(QUIET)$(call MSG_L1,Doing a test build of the guest kernel modules)
-        $(QUIET)$(RM) -f -- "$@"
-        $(QUIET)$(RM) -Rf -- "$(VBOX_LNX_ADD_TEST)"
-        $(QUIET)$(MKDIR) -p -- "$(VBOX_LNX_ADD_TEST)"
-        $(QUIET)$(CP) -R -- "$(PATH_STAGE_BIN)/additions/src/" "$(VBOX_LNX_ADD_TEST)/"
-        + $(QUIET)make -C $(VBOX_LNX_ADD_TEST) clean
-        + $(QUIET)make -C $(VBOX_LNX_ADD_TEST)
-        $(QUIET)$(RM) -Rf -- $(VBOX_LNX_ADD_TEST)
-        $(QUIET)$(APPEND) -t "$@" "done"
- endif
-endif
-
 
 
@@ -395 +367 @@
         $(VBOX_LNX_ADD_INST_OUT_DIR)install.sh \
         $(VBOX_LNX_ADD_INST_STAGE_DIR)install.sh
+
+
+#
+# Build test for the Guest Additions kernel modules (kmk check).
+#
+if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_SDK)
+ VBOX_LNX_ADD_TEST        = $(PATH_TARGET)/tstguest_mod
+ VBOX_LNX_ADD_TEST_TARGET = $(PATH_TARGET)/tstguest_mod.run
+ TESTING     += $(VBOX_LNX_ADD_TEST_TARGET)
+ OTHERS      += $(VBOX_LNX_ADD_TEST_TARGET)
+ $$(VBOX_LNX_ADD_TEST_TARGET): \
+                $$(vboxguest-src_2_STAGE_TARGETS) \
+                $$(vboxsf-mod_2_STAGE_TARGETS) \
+                $$(vboxvideo_drm-mod_2_STAGE_TARGETS) \
+                $$(GuestDrivers-src_2_STAGE_TARGETS)
+        $(QUIET)$(call MSG_L1,Doing a test build of the guest kernel modules)
+        $(QUIET)$(RM) -f -- "$@"
+        $(QUIET)$(RM) -Rf -- "$(VBOX_LNX_ADD_TEST)"
+        $(QUIET)$(MKDIR) -p -- "$(VBOX_LNX_ADD_TEST)"
+        $(QUIET)$(CP) -R -- "$(PATH_STAGE_BIN)/additions/src/" "$(VBOX_LNX_ADD_TEST)/"
+        + $(QUIET)make -C $(VBOX_LNX_ADD_TEST) clean
+        + $(QUIET)make -C $(VBOX_LNX_ADD_TEST)
+        $(QUIET)$(RM) -Rf -- $(VBOX_LNX_ADD_TEST)
+        $(QUIET)$(APPEND) -t "$@" "done"
+endif