Changeset 6329 in vbox for trunk/src/VBox/HostServices/SharedFolders/testcase

Timestamp:

Jan 10, 2008 3:27:39 PM (17 years ago)

Author:

vboxsync

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

27213

Message:

make theh tstShflSizes test mandatory during build time

Location:

trunk/src/VBox/HostServices/SharedFolders/testcase

Files:

• Makefile.kmk (modified) (2 diffs)
• tstShflSizes.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk

@@ -20 +20 @@
 include $(PATH_KBUILD)/subheader.kmk
 
+PROGRAMS += tstShflSizes
+tstShflSizes_TEMPLATE = VBOXR3TSTEXE
+tstShflSizes_DEFS     = VBOX_HGCM
+tstShflSizes_SOURCES  = tstShflSizes.cpp
+tstShflSizes_LIBS     = $(LIB_RUNTIME)
+
 ifdef VBOX_WITH_TESTCASES
 #
 # Structure size testcase.
 #
-PROGRAMS += tstShflSizes tstShflCase
-tstShflSizes_TEMPLATE = VBOXR3TSTEXE
-tstShflSizes_DEFS     = VBOX_HGCM
-tstShflSizes_SOURCES  = tstShflSizes.cpp
-tstShflSizes_LIBS     = $(LIB_RUNTIME)
+PROGRAMS += tstShflCase
 
 tstShflCase_TEMPLATE = VBOXR3TSTEXE
@@ -37 +39 @@
 endif # VBOX_WITH_TESTCASES
 
+ifeq ($(BUILD_TARGET),$(BUILD_PLATFORM))
+ ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(BUILD_TARGET_ARCH).$(BUILD_PLATFORM_ARCH)),)
+   OTHERS += \
+    $(PATH_TARGET)/tstShflSizes.run
+ endif
+endif
+
+OTHER_CLEAN += \
+        $(PATH_TARGET)/tstShflSizes.run
+
 include $(PATH_KBUILD)/subfooter.kmk
 
+$(PATH_TARGET)/tstShflSizes.run: $(INSTARGET_tstShflSizes)
+        $(QUIET)$(RM) -f $@
+        $(INSTARGET_tstShflSizes) quiet
+        $(QUIET)$(APPEND) "$@" "done"
+

trunk/src/VBox/HostServices/SharedFolders/testcase/tstShflSizes.cpp

@@ -22 +22 @@
 #include <VBox/shflsvc.h>
 #include <iprt/stream.h>
+#include <iprt/string.h>
 
 #define STRUCT(t, size)   \
@@ -32 +33 @@
             cErrors++; \
         } \
-        else \
+        else if (!fQuiet)\
             RTPrintf("%30s: %d\n", #t, (int)sizeof(t)); \
     } while (0)
@@ -44 +45 @@
      * Prints the code below if any argument was giving.
      */
-    bool fPrintChecks = argc != 1;
+    bool fQuiet = argc == 2 && !strcmp(argv[1], "quiet");
+    bool fPrintChecks = !fQuiet && argc != 1;
+
+    RTPrintf("tstShflSizes: TESTING\n");
 
     /*
@@ -58 +62 @@
     STRUCT(SHFLVOLINFO, 40);
     STRUCT(VBoxSFQueryMappings, 52);
-    STRUCT(VBoxSFQueryMapName, 52);
+    STRUCT(VBoxSFQueryMapName, 40); /* this was changed from 52 in 21976 after VBox-1.4) */
     STRUCT(VBoxSFMapFolder_Old, 52);
     STRUCT(VBoxSFMapFolder, 64);