Changeset 76322 in vbox

Timestamp:

Dec 20, 2018 6:02:27 PM (6 years ago)

Author:

vboxsync

Message:

Reverted accidental commit r127614.

Location:

trunk

Files:

• include/iprt/assert.h (modified) (1 diff)
• src/VBox/HostDrivers/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/Support/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxPci/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/testcase/tstRTJson.cpp (modified) (1 diff)

trunk/include/iprt/assert.h

@@ -75 +75 @@
   && defined(IN_RING3) \
   && !defined(IN_RT_STATIC) /* try keep static binaries small */ \
-  && (defined(RT_ARCH_AMD64) /*|| defined(RT_ARCH_X86)*/)
+  && (defined(RT_ARCH_AMD64) /*|| defined(RT_ARCH_X86)*/) \
+  && (defined(RT_OS_WINDOWS) /*|| ... */)
 /** @def IPRT_WITH_ASSERT_STACK
  * Indicates that we collect a callstack stack on assertion. */

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -65 +65 @@
 endif # !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_VALIDATIONKIT)
 
+
+#
+# Build test for the linux host kernel modules.
+#
+$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxdrv-src,,save_symvers)
+ifdef VBOX_WITH_NETFLT
+$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxNetFlt-src,vboxdrv-src,)
+endif
+ifdef VBOX_WITH_NETADP
+$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxNetAdp-src,vboxdrv-src,)
+endif
+ifdef VBOX_WITH_PCI_PASSTHROUGH
+$(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxPci-src,vboxdrv-src,)
+endif
+
+
 # Let kBuild generate the rules.
 include $(FILE_KBUILD_SUB_FOOTER)

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

@@ -771 +771 @@
         %$(QUIET2)$(APPEND) -t '$(PATH_TARGET)/vboxdrv-src-1.dep' \
                 'Support/$(KBUILD_TARGET)/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
-
- #
- # Build test for the linux host kernel modules.
- #
- $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,vboxdrv-src,,save_symvers)
 endif # linux freebsd
 

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

@@ -182 +182 @@
         %$(QUIET2)$(APPEND) -t '$(PATH_TARGET)/VBoxNetAdp-src-1.dep' 'VBoxNetAdp/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
 
- #
- # Build test for the linux host kernel modules.
- #
- $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxNetAdp-src,vboxdrv-src,)
+
 endif # linux
 

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

@@ -533 +533 @@
         %$(QUIET2)$(APPEND) '$(PATH_TARGET)/VBoxNetFlt-src-1.dep' 'VBoxNetFlt/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
 
- #
- # Build test for the linux host kernel modules.
- #
- $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxNetFlt-src,vboxdrv-src,)
 endif # linux
 

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

@@ -74 +74 @@
         %$(QUIET2)$(APPEND) -t '$(PATH_TARGET)/VBoxPci-src-1.dep' 'VBoxPci/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
 
- #
- # Build test for the linux host kernel modules.
- #
- $(evalcall2 VBOX_LINUX_KMOD_TEST_BUILD_RULE_FN,VBoxPci-src,vboxdrv-src,)
-
 endif # Supported platform.
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/Runtime/testcase/tstRTJson.cpp

@@ -110 +110 @@
         { "\"\\t\\n\\b\\f\\r\\\\\\/\"", VINF_SUCCESS},
     };
-AssertFailed(); // DONT COMMIT THIS!
     for (unsigned iTest = 0; iTest < RT_ELEMENTS(aTests); iTest++)
     {