Changeset 40430 in vbox

Timestamp:

Mar 12, 2012 2:39:27 PM (13 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxGuest: disable Solaris test case on Windows hosts as VCC7 does not have variadic macros.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• Makefile.kmk (modified) (1 diff)
• testcase/solaris.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -209 +209 @@
 
 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
- PROGRAMS += tstVBoxGuest-solaris
- tstVBoxGuest-solaris_TEMPLATE = VBOXR3TSTEXE
- tstVBoxGuest-solaris_SOURCES  = \
-        VBoxGuest-solaris-streams.c \
-        testcase/tstVBoxGuest-solaris.cpp
- tstVBoxGuest-solaris_DEFS     = TESTCASE
- tstVBoxGuest-solaris_LIBS     = $(LIB_RUNTIME)
+ ifneq ($(KBUILD_TARGET),win)  # No variadic macros in Visual C++ 2002
+  PROGRAMS += tstVBoxGuest-solaris
+ endif
 endif
+tstVBoxGuest-solaris_TEMPLATE = VBOXR3TSTEXE
+tstVBoxGuest-solaris_SOURCES  = \
+    VBoxGuest-solaris-streams.c \
+    testcase/tstVBoxGuest-solaris.cpp
+tstVBoxGuest-solaris_DEFS     = TESTCASE
+tstVBoxGuest-solaris_LIBS     = $(LIB_RUNTIME)
 
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/Additions/common/VBoxGuest/testcase/solaris.h

@@ -21 +21 @@
 #include <iprt/assert.h>
 #include <iprt/string.h>  /* RT_ZERO */
+#ifdef RT_OS_WINDOWS
+# include <WinSock2.h>  /* struct timeval */
+#endif
 #include <errno.h>
 #include <time.h>  /* struct timeval */