Changeset 21207 in vbox for trunk/src

Timestamp:

Jul 3, 2009 2:22:16 PM (16 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: add a unit test for seamless. Failing tests are disabled

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (1 diff)
• seamless-x11.cpp (modified) (1 diff)
• seamless-x11.h (modified) (3 diffs)
• testcase/tstSeamlessX11-auto.cpp (added)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -78 +78 @@
              || $(CP_EXT) -f  `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@
 
+ifdef VBOX_X11_SEAMLESS_GUEST
+ if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
 
-ifdef VBOX_X11_SEAMLESS_GUEST
- ifdef VBOX_WITH_TESTCASES
-  ifndef VBOX_ONLY_ADDITIONS
+# Set this in LocalConfig.kmk if you are working on the X11 clipboard service
+# to automatically run the unit test at build time.
+#       OTHERS += $(PATH_tstSeamlessX11-auto)/tstSeamlessX11-auto.run
+
+   PROGRAMS += tstSeamlessX11-auto
+   tstSeamlessX11-auto_TEMPLATE = VBOXR3TSTEXE
+   tstSeamlessX11-auto_SOURCES = \
+           testcase/tstSeamlessX11-auto.cpp \
+           seamless-x11.cpp
+   tstSeamlessX11-auto_DEFS = TESTCASE
+   tstSeamlessX11-auto_LIBS = \
+           $(LIB_RUNTIME)
+
+   TESTING  += $(PATH_tstSeamlessX11-auto)/tstSeamlessX11-auto
+$$(PATH_tstSeamlessX11-auto)/tstSeamlessX11-auto.run: \
+        $$(INSTARGET_tstSeamlessX11-auto)
+        export VBOX_LOG_DEST=nofile; $(INSTARGET_tstSeamlessX11-auto) quiet
+        $(QUIET)$(APPEND) -t "$@" "done"
+
    #
    # Additional testcase designed to be run manually, which initiates and starts the Linux

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

@@ -37 +37 @@
 #include <limits.h>
 
-/* This is defined wrong in my X11 header files! */
-#define VBoxShapeNotify 64
+#ifdef TESTCASE
+#undef DefaultRootWindow
+#define DefaultRootWindow XDefaultRootWindow
+#endif
 
 /*****************************************************************************

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.h

@@ -37 +37 @@
 #define WM_TYPE_PROP "_NET_WM_WINDOW_TYPE"
 #define WM_TYPE_DESKTOP_PROP "_NET_WM_WINDOW_TYPE_DESKTOP"
+
+/* This is defined wrong in my X11 header files! */
+#define VBoxShapeNotify 64
 
 /**
@@ -288 +291 @@
 
     // Private methods
-
-    // Methods to handle X11 events
-    void doConfigureEvent(const XConfigureEvent *event);
-    void doMapEvent(const XMapEvent *event);
-    void doUnmapEvent(const XUnmapEvent *event);
-    void doShapeEvent(const XShapeEvent *event);
 
     // Methods to manage guest window information
@@ -350 +347 @@
     bool interruptEvent(void);
 
+    /* Methods to handle X11 events.  These are public so that the unit test
+     * can call them. */
+    void doConfigureEvent(const XConfigureEvent *event);
+    void doMapEvent(const XMapEvent *event);
+    void doUnmapEvent(const XUnmapEvent *event);
+    void doShapeEvent(const XShapeEvent *event);
+
     VBoxGuestSeamlessX11(void)
     {