Changeset 82922 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Jan 30, 2020 11:41:25 AM (5 years ago)

Author:

vboxsync

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

135903

Message:

Shared Clipboard/tstClipboardGH-X11: More linking fun required for the testboxes.

Location:

trunk/src/VBox/GuestHost/SharedClipboard

Files:

• clipboard-x11.cpp (modified) (6 diffs)
• testcases/Makefile.kmk (modified) (1 diff)
• testcases/tstClipboardGH-X11.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

@@ -131 +131 @@
     { "LAST",                               SHCLX11FMT_INVALID,     VBOX_SHCL_FMT_NONE },
 };
+
+
+#ifdef TESTCASE
+# ifdef RT_OS_SOLARIS_10
+char XtStrings [] = "";
+WidgetClassRec* applicationShellWidgetClass;
+char XtShellStrings [] = "";
+int XmbTextPropertyToTextList(
+    Display*            /* display */,
+    XTextProperty*      /* text_prop */,
+    char***             /* list_return */,
+    int*                /* count_return */
+)
+{
+  return 0;
+}
+# else
+const char XtStrings [] = "";
+_WidgetClassRec* applicationShellWidgetClass;
+const char XtShellStrings [] = "";
+# endif /* RT_OS_SOLARIS_10 */
+#endif /* TESTCASE */
 
 
@@ -770 +792 @@
 } XFixesSelectionNotifyEvent;
 
+#ifndef TESTCASE
 /**
  * Waits until an event arrives and handle it if it is an XFIXES selection
@@ -776 +799 @@
  * @param   pCtx                The X11 clipboard context to use.
  */
-void clipPeekEventAndDoXFixesHandling(PSHCLX11CTX pCtx)
+static void clipPeekEventAndDoXFixesHandling(PSHCLX11CTX pCtx)
 {
     union
@@ -798 +821 @@
 }
 
-#ifndef TESTCASE
 /**
  * The main loop of our X11 event thread.
@@ -980 +1002 @@
     }
 #endif
+
     if (RT_SUCCESS(rc))
     {
@@ -994 +1017 @@
             rc = clipRegisterContext(pCtx);
     }
+
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/GuestHost/SharedClipboard/testcases/Makefile.kmk

@@ -33 +33 @@
         ../clipboard-x11.cpp \
         ../clipboard-common.cpp
-  tstClipboardGH-X11_LIBPATH  = $(VBOX_LIBPATH_X11)
-  tstClipboardGH-X11_LIBS     = Xt
   tstClipboardGH-X11_CLEAN    = $(tstClipboardGH-X11_0_OUTDIR)/tstClipboardGH-X11.run
 

trunk/src/VBox/GuestHost/SharedClipboard/testcases/tstClipboardGH-X11.cpp

@@ -455 +455 @@
     *ppReq = g_tst_pCompletedReq;
 }
-#ifdef RT_OS_SOLARIS_10
-char XtStrings [] = "";
-_WidgetClassRec* applicationShellWidgetClass;
-char XtShellStrings [] = "";
-int XmbTextPropertyToTextList(
-    Display*            /* display */,
-    XTextProperty*      /* text_prop */,
-    char***             /* list_return */,
-    int*                /* count_return */
-)
-{
-  return 0;
-}
-#else
-const char XtStrings [] = "";
-_WidgetClassRec* applicationShellWidgetClass;
-const char XtShellStrings [] = "";
-#endif
 
 static void tstStringFromX11(RTTEST hTest, PSHCLX11CTX pCtx,