Changeset 47266 in vbox for trunk

Timestamp:

Jul 19, 2013 2:53:32 PM (12 years ago)

Author:

vboxsync

Message:

Config.kmk: new template for Main unit testing
Main/testcase: fix building of mouse unit test

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/testcase/Makefile.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -4145 +4145 @@
 TEMPLATE_VBOXMAINLIB_EXTENDS = VBOXMAINDLL
 TEMPLATE_VBOXMAINLIB_LIBS =
+
+#
+# Main unit testing, for compiling API implementation files into a testcase.
+# This is the VBOXMAINEXE template only with a different install dir.
+#
+TEMPLATE_VBOXMAINTSTEXE  = VBox Main Testcase Exe
+TEMPLATE_VBOXMAINTSTEXE_EXTENDS = VBOXMAINEXE
+TEMPLATE_VBOXMAINTSTEXE_INST    = $(INST_TESTCASE)
+ifdef VBOX_WITH_RUNPATH
+ TEMPLATE_VBOXMAINTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_VBOXMAINEXE_LDFLAGS)
+else ifdef VBOX_WITH_RELATIVE_RUNPATH
+ TEMPLATE_VBOXMAINTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_VBOXMAINEXE_LDFLAGS)
+endif
+if "$(KBUILD_TARGET)" == "win" && defined(VBOX_SIGNING_MODE)
+ TEMPLATE_VBOXMAINTSTEXE_POST_CMDS =
+endif
 
 #

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -32 +32 @@
         $(if $(VBOX_WITH_GUEST_CONTROL),tstGuestCtrlParseBuffer,) \
         $(if $(VBOX_WITH_GUEST_CONTROL),tstGuestCtrlContextID,) \
-        $(if ,tstMouseImpl,)
+        $(if true,tstMouseImpl,)
   PROGRAMS.linux += \
         $(if $(VBOX_WITH_USB),tstUSBProxyLinux,)
@@ -212 +212 @@
 # tstMouseImpl
 #
-# Not yet enabled, as I still haven't managed to wrap everything into the test
-# case.
-#
-tstMouseImpl_TEMPLATE = VBOXR3TSTEXE
+tstMouseImpl_TEMPLATE = VBOXMAINTSTEXE
 tstMouseImpl_SOURCES  = \
         tstMouseImpl.cpp \
@@ -224 +221 @@
         $(VBOX_AUTOGEN_EVENT_CPP) \
         $(VBOX_XML_SCHEMADEFS_CPP)
-tstMouseImpl_CFLAGS   += $(TEMPLATE_VBOXMAINEXE_CFLAGS)
-tstMouseImpl_CXXFLAGS += $(TEMPLATE_VBOXMAINEXE_CXXFLAGS)
-tstMouseImpl_DEFS     += $(TEMPLATE_VBOXMAINEXE_DEFS)
 tstMouseImpl_INCS      = ../include \
     $(VBOX_PATH_SDK)/bindings/xpcom/include \
@@ -232 +226 @@
     $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
         $(dir $(VBOX_XML_SCHEMADEFS_H))
-tstMouseImpl_INCS     += $(TEMPLATE_VBOXMAINEXE_INCS)
 tstMouseImpl_LIBS      = $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB)
-tstMouseImpl_LIBS     += $(TEMPLATE_VBOXMAINEXE_LIBS)