VirtualBox

Changeset 76320 in vbox for trunk


Ignore:
Timestamp:
Dec 20, 2018 5:57:32 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
127613
Message:

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

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r76317 r76320  
    45344534 ##       thus everything else needs escaped dollars.
    45354535 ##
    4536 define VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN
    4537   TESTING      += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
    4538   OTHERS       += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
    4539   OTHERS_CLEAN += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
    4540   $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run: \
     4536 if   defined(VBOX_WITH_TESTCASES) \
     4537  && "$(KBUILD_HOST)" == "linux" \
     4538  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)" \
     4539  && !defined(VBOX_WITHOUT_LINUX_TEST_BUILDS) \
     4540  && !defined(VBOX_ONLY_SDK) \
     4541  && !defined(VBOX_ONLY_DOCS) \
     4542  && !defined(VBOX_ONLY_VALIDATIONKIT)
     4543  define VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN
     4544   ifneq ($(KERN_DIR),)
     4545TESTING      += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
     4546OTHERS       += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
     4547OTHERS_CLEAN += $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
     4548$$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run: \
    45414549                $$(if $(2),$$(PATH_TARGET)/tst$(2)$(subst /,_,$(KERN_DIR))_mod.run,) \
    45424550                $$$$($(1)_2_STAGE_TARGETS)
    … …  
    45484556        $(QUIET)$$(CP) -R    -- "$$(PATH_STAGE_BIN)/../$$($(1)_INST)" "$$(PATH_TARGET)/tst$(1)_mod/"
    45494557        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) KERN_DIR=$(KERN_DIR) -C $$(PATH_TARGET)/tst$(1)_mod clean
    4550   ifneq ($(2),)
     4558   ifneq ($(2),)
    45514559        $(QUIET)$$(CP) -f    -- "$$<" "$$(PATH_TARGET)/tst$(1)_mod/Module.symvers"
    4552   endif
     4560   endif
    45534561        + $(QUIET)make KBUILD_VERBOSE=$(KBUILD_VERBOSE) KERN_DIR=$(KERN_DIR) $(if-expr $(KMK_OPTS_JOBS) != 0,JOBS=$(KMK_OPTS_JOBS),) -C $$(PATH_TARGET)/tst$(1)_mod \
    45544562                2>&1 | tee "$$(PATH_TARGET)/tst$(1)_mod/make.err"
    45554563        $(QUIET)! grep "^WARNING: .* undefined!$$$$" "$$(PATH_TARGET)/tst$(1)_mod/make.err"
    4556   if1of ($(USERNAME), bird)
     4564   if1of ($(USERNAME), bird)
    45574565        - nm -u "$$(PATH_TARGET)/tst$(1)_mod/"*.ko | sort
    4558   endif
    4559   ifneq ($(3),)
     4566   endif
     4567   ifneq ($(3),)
    45604568        $(QUIET)$$(CP) -f    -- "$$(PATH_TARGET)/tst$(1)_mod/Module.symvers" "$$@"
    4561   else
     4569   else
    45624570        $(QUIET)$$(APPEND) -t "$$@" "done"
    4563   endif
     4571   endif
    45644572        $(QUIET)$$(RM) -Rf   -- "$$(PATH_TARGET)/tst$(1)_mod"
    4565  endef
    45664573vbox-linux-kmod-test-builds: $$(PATH_TARGET)/tst$(1)$(subst /,_,$(KERN_DIR))_mod.run
    4567 endif
     4574  endif
     4575 endef # VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN
     4576 else
     4577  VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN =
     4578 endif
     4579else
     4580  VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN =
     4581endif # linux target
    45684582
    45694583ifeq ($(KBUILD_TARGET),os2)

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

    r76317 r76320  
    230230 # Build test for the Guest Additions kernel module (kmk check).
    231231 #
    232  if   defined(VBOX_WITH_TESTCASES) \
    233   && !defined(VBOX_ONLY_SDK) \
    234   && !defined(VBOX_ONLY_DOCS) \
    235   && !defined(VBOX_ONLY_VALIDATIONKIT) \
    236   && !defined(VBOX_WITHOUT_LINUX_TEST_BUILDS) \
    237   && "$(KBUILD_TARGET)" == "linux" \
    238   && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
    239   ifneq ($(KERN_DIR),)
    240232$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxguest-src,,save_symvers)
    241   endif
    242  endif
    243233endif # Linux
    244234

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

    r76317 r76320  
    359359# Build test for the Guest Additions kernel modules (kmk check).
    360360#
    361 if   defined(VBOX_WITH_TESTCASES) \
    362  && !defined(VBOX_ONLY_SDK) \
    363  && !defined(VBOX_ONLY_DOCS) \
    364  && !defined(VBOX_ONLY_VALIDATIONKIT) \
    365  && !defined(VBOX_WITHOUT_LINUX_TEST_BUILDS) \
    366  && "$(KBUILD_TARGET)" == "linux" \
    367  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
    368  ifneq ($(KERN_DIR),)
    369   $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxsf-src,vboxguest-src,)
    370   $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxvideo-src,,)
    371  endif
    372 endif
     361$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxsf-src,vboxguest-src,)
     362$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxvideo-src,,)
    373363
    374364

  • trunk/src/VBox/HostDrivers/Makefile.kmk

    r76317 r76320  
    6969# Build test for the linux host kernel modules.
    7070#
    71 if   defined(VBOX_WITH_TESTCASES) \
    72  && !defined(VBOX_ONLY_SDK) \
    73  && !defined(VBOX_ONLY_DOCS) \
    74  && !defined(VBOX_ONLY_VALIDATIONKIT) \
    75  && !defined(VBOX_WITHOUT_LINUX_TEST_BUILDS) \
    76  && "$(KBUILD_TARGET)" == "linux" \
    77  && "$(KBUILD_HOST_ARCH)" == "$(KBUILD_TARGET_ARCH)"
    78  ifneq ($(KERN_DIR),)
    7971$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxdrv-src,,save_symvers)
    80   ifdef VBOX_WITH_NETFLT
     72ifdef VBOX_WITH_NETFLT
    8173$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxNetFlt-src,vboxdrv-src,)
    82   endif
    83   ifdef VBOX_WITH_NETADP
     74endif
     75ifdef VBOX_WITH_NETADP
    8476$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxNetAdp-src,vboxdrv-src,)
    85   endif
    86   ifdef VBOX_WITH_PCI_PASSTHROUGH
     77endif
     78ifdef VBOX_WITH_PCI_PASSTHROUGH
    8779$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxPci-src,vboxdrv-src,)
    88   endif
    89  endif
    9080endif
    9181
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette