Changeset 76320 in vbox for trunk/src/VBox

Timestamp:

Dec 20, 2018 5:57:32 PM (6 years ago)

Author:

vboxsync

Message:

Config.kmk,drivers/Makefile.kmk: More cleanups around VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN (formerly VBOX_LINUX_GENERATE_KMOD_TEST).

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/Makefile.kmk (modified) (1 diff)
• Additions/linux/Makefile.kmk (modified) (1 diff)
• HostDrivers/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -230 +230 @@
  # Build test for the Guest Additions kernel module (kmk check).
  #
- if   defined(VBOX_WITH_TESTCASES) \
-  && !defined(VBOX_ONLY_SDK) \
-  && !defined(VBOX_ONLY_DOCS) \
-  && !defined(VBOX_ONLY_VALIDATIONKIT) \
-  && !defined(VBOX_WITHOUT_LINUX_TEST_BUILDS) \
-  && "$(KBUILD_TARGET)" == "linux" \
-  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
-  ifneq ($(KERN_DIR),)
 $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxguest-src,,save_symvers)
-  endif
- endif
 endif # Linux
 

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

@@ -359 +359 @@
 # Build test for the Guest Additions kernel modules (kmk check).
 #
-if   defined(VBOX_WITH_TESTCASES) \
- && !defined(VBOX_ONLY_SDK) \
- && !defined(VBOX_ONLY_DOCS) \
- && !defined(VBOX_ONLY_VALIDATIONKIT) \
- && !defined(VBOX_WITHOUT_LINUX_TEST_BUILDS) \
- && "$(KBUILD_TARGET)" == "linux" \
- && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
- ifneq ($(KERN_DIR),)
-  $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxsf-src,vboxguest-src,)
-  $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxvideo-src,,)
- endif
-endif
+$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxsf-src,vboxguest-src,)
+$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxvideo-src,,)
 
 

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -69 +69 @@
 # Build test for the linux host kernel modules.
 #
-if   defined(VBOX_WITH_TESTCASES) \
- && !defined(VBOX_ONLY_SDK) \
- && !defined(VBOX_ONLY_DOCS) \
- && !defined(VBOX_ONLY_VALIDATIONKIT) \
- && !defined(VBOX_WITHOUT_LINUX_TEST_BUILDS) \
- && "$(KBUILD_TARGET)" == "linux" \
- && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
- ifneq ($(KERN_DIR),)
 $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxdrv-src,,save_symvers)
-  ifdef VBOX_WITH_NETFLT
+ifdef VBOX_WITH_NETFLT
 $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxNetFlt-src,vboxdrv-src,)
-  endif
-  ifdef VBOX_WITH_NETADP
+endif
+ifdef VBOX_WITH_NETADP
 $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxNetAdp-src,vboxdrv-src,)
-  endif
-  ifdef VBOX_WITH_PCI_PASSTHROUGH
+endif
+ifdef VBOX_WITH_PCI_PASSTHROUGH
 $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxPci-src,vboxdrv-src,)
-  endif
- endif
 endif