Changeset 47779 in vbox

Timestamp:

Aug 15, 2013 5:59:50 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

88038

Message:

Config.kmk: new template for API client testcases
Main/testcase: simplify it greatly by using templates, add a new testcase for medium locking

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Main/testcase/Makefile.kmk (modified) (11 diffs)
• src/VBox/Main/testcase/tstMediumLock.cpp (added)

trunk/Config.kmk

@@ -4167 +4167 @@
 # Template for building executables that use the VBox Main component.
 #
-TEMPLATE_VBOXMAINCLIENTEXE             = VBox Main Client (executable)
-TEMPLATE_VBOXMAINCLIENTEXE_EXTENDS     = VBOXMAINEXE
+TEMPLATE_VBOXMAINCLIENTEXE              = VBox Main Client (executable)
+TEMPLATE_VBOXMAINCLIENTEXE_EXTENDS      = VBOXMAINEXE
 ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_VBOXMAINCLIENTEXE_LIBS.win   = $(TEMPLATE_VBOXMAINEXE_LIBS.win) \
+ TEMPLATE_VBOXMAINCLIENTEXE_DEPS                = $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
+ TEMPLATE_VBOXMAINCLIENTEXE_LIBS.win    = $(TEMPLATE_VBOXMAINEXE_LIBS.win) \
    $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/User32.Lib \
    $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Shell32.Lib \
@@ -4178 +4179 @@
    $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Uuid.Lib
 else
- TEMPLATE_VBOXMAINCLIENTEXE_DEFS = $(TEMPLATE_VBOXMAINEXE_DEFS) \
+ TEMPLATE_VBOXMAINCLIENTEXE_DEPS                = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
+ TEMPLATE_VBOXMAINCLIENTEXE_DEFS                = $(TEMPLATE_VBOXMAINEXE_DEFS) \
         NDEBUG TRIMMED
  TEMPLATE_VBOXMAINCLIENTEXE_CXXFLAGS.linux = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS.linux) \
@@ -4198 +4200 @@
 endif
 TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
+
+#
+# Template for building testcases which are API clients.
+#
+TEMPLATE_VBOXMAINCLIENTTSTEXE           = VBox Main Client Testcase (executable)
+TEMPLATE_VBOXMAINCLIENTTSTEXE_EXTENDS   = VBOXMAINCLIENTEXE
+TEMPLATE_VBOXMAINCLIENTTSTEXE_INST      = $(INST_TESTCASE)
+ifdef VBOX_WITH_RUNPATH
+ TEMPLATE_VBOXMAINCLIENTTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS)
+else ifdef VBOX_WITH_RELATIVE_RUNPATH
+ TEMPLATE_VBOXMAINCLIENTTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS)
+endif
+if "$(KBUILD_TARGET)" == "win" && defined(VBOX_SIGNING_MODE)
+ TEMPLATE_VBOXMAINCLIENTTSTEXE_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 true,tstMouseImpl,)
+        tstMediumLock \
+        tstMouseImpl
   PROGRAMS.linux += \
         $(if $(VBOX_WITH_USB),tstUSBProxyLinux,)
@@ -60 +61 @@
 # tstAPI
 #
-tstAPI_TEMPLATE = VBOXMAINCLIENTEXE
+tstAPI_TEMPLATE = VBOXMAINCLIENTTSTEXE
 #tstAPI_INST = $(INST_SDK)bindings/gluecom/samples/
 tstAPI_SOURCES  = tstAPI.cpp
-ifeq ($(KBUILD_TARGET),win) ## @todo just add this to the template.
-tstAPI_DEPS = $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
-else
-tstAPI_DEPS = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
-endif
-ifdef VBOX_WITH_RESOURCE_USAGE_API
-tstAPI_DEFS += VBOX_WITH_RESOURCE_USAGE_API
-endif
 
 
@@ -76 +69 @@
 # tstOVF
 #
-tstOVF_TEMPLATE = VBOXMAINCLIENTEXE
+tstOVF_TEMPLATE = VBOXMAINCLIENTTSTEXE
 #tstOVF_INST = $(INST_SDK)bindings/gluecom/samples/
 tstOVF_SOURCES  = tstOVF.cpp
-ifeq ($(KBUILD_TARGET),win) ## @todo just add this to the template.
-tstOVF_DEPS = $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
-else
-tstOVF_DEPS = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
-endif
-ifdef VBOX_WITH_RESOURCE_USAGE_API
-tstOVF_DEFS += VBOX_WITH_RESOURCE_USAGE_API
-endif
 
 ifndef VBOX_OSE
@@ -109 +94 @@
 # It comes with a custom makefile which should be tested as well!
 #
-tstVBoxAPILinux_TEMPLATE = VBOXR3EXE
+tstVBoxAPILinux_TEMPLATE = VBOXMAINCLIENTTSTEXE
 tstVBoxAPILinux_SOURCES  = tstVBoxAPILinux.cpp
-tstVBoxAPILinux_CXXFLAGS = -Wno-non-virtual-dtor -fshort-wchar
-tstVBoxAPILinux_LDFLAGS.solaris += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/../../..'
-ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
- tstVBoxAPILinux_DEFS += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-endif
-tstVBoxAPILinux_DEFS += VBOX_WITH_XPCOM
-tstVBoxAPILinux_INCS     = \
-        $(VBOX_XPCOM_INCS) \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include
-tstVBoxAPILinux_LIBPATH  = $(LIBPATH_XPCOM)
-tstVBoxAPILinux_LIBS     = $(LIB_XPCOM) $(LIB_RUNTIME)
-tstVBoxAPILinux_DEPS     = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 
 
@@ -129 +101 @@
 # tstVBoxAPIWin
 #
-tstVBoxAPIWin_TEMPLATE = VBOXMAINCLIENTEXE
+tstVBoxAPIWin_TEMPLATE = VBOXMAINCLIENTTSTEXE
 tstVBoxAPIWin_SOURCES  = \
         tstVBoxAPIWin.cpp \
         $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c
-tstVBoxAPIWin_DEPS     = \
-        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
 
 
@@ -140 +110 @@
 # tstCollector
 #
-tstCollector_TEMPLATE = VBOXMAINCLIENTEXE
+tstCollector_TEMPLATE = VBOXMAINCLIENTTSTEXE
 tstCollector_SOURCES  = \
         tstCollector.cpp \
@@ -154 +124 @@
 # tstGuestCtrlParseBuffer
 #
-tstGuestCtrlParseBuffer_TEMPLATE = VBOXMAINCLIENTEXE
+tstGuestCtrlParseBuffer_TEMPLATE = VBOXMAINCLIENTTSTEXE
 tstGuestCtrlParseBuffer_DEFS    += VBOX_WITH_HGCM VBOX_WITH_GUEST_CONTROL VBOX_GUESTCTRL_TEST_CASE
 tstGuestCtrlParseBuffer_SOURCES  = \
@@ -160 +130 @@
         ../src-client/GuestCtrlPrivate.cpp
 tstGuestCtrlParseBuffer_INCS     = ../include
-ifeq ($(KBUILD_TARGET),win) ## @todo just add this to the template.
- tstGuestCtrlParseBuffer_DEPS    = $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
-else
- tstGuestCtrlParseBuffer_DEPS    = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
-endif
 
 
@@ -170 +135 @@
 # tstGuestCtrlContextID
 #
-tstGuestCtrlContextID_TEMPLATE = VBOXMAINCLIENTEXE
+tstGuestCtrlContextID_TEMPLATE = VBOXMAINCLIENTTSTEXE
 tstGuestCtrlContextID_DEFS    += VBOX_WITH_HGCM VBOX_WITH_GUEST_CONTROL VBOX_GUESTCTRL_TEST_CASE
 tstGuestCtrlContextID_SOURCES  = \
@@ -176 +141 @@
         ../src-client/GuestCtrlPrivate.cpp
 tstGuestCtrlContextID_INCS     = ../include
-ifeq ($(KBUILD_TARGET),win) ## @todo just add this to the template.
- tstGuestCtrlContextID_DEPS    = $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
-else
- tstGuestCtrlContextID_DEPS    = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
-endif
 
 
@@ -210 +170 @@
 
 #
+# tstMediumLock
+#
+tstMediumLock_TEMPLATE = VBOXMAINCLIENTTSTEXE
+tstMediumLock_SOURCES  = tstMediumLock.cpp
+
+
+#
 # tstMouseImpl
 #