Changeset 52379 in vbox for trunk/src/VBox/Storage/testcase

Timestamp:

Aug 14, 2014 12:08:18 PM (10 years ago)

Author:

vboxsync

Message:

Storage/tstVDIo: make it build on Windows, excluding the I/O log replay functionality

Location:

trunk/src/VBox/Storage/testcase

Files:

• Makefile.kmk (modified) (3 diffs)
• tstVDIo.cpp (modified) (9 diffs)

trunk/src/VBox/Storage/testcase/Makefile.kmk

@@ -48 +48 @@
  tstVDCopy_LIBS = $(LIB_DDU)
 
- ifn1of ($(KBUILD_TARGET),win)
-  PROGRAMS += tstVDIo
+ PROGRAMS += tstVDIo
 
-  #
-  # VD I/O test scripts to built in -> .cpp
-  #
-  TSTVDIO_BUILTIN_TESTS_FILE = $(tstVDIo_0_OUTDIR)/BuiltinTests.cpp
-  TSTVDIO_BUILTIN_TESTS := \
-         tstVDIo=tstVDIo.vd \
-         tstVDResize=tstVDResize.vd \
-         tstVDCompact=tstVDCompact.vd \
-         tstVDCopy=tstVDCopy.vd \
-         tstVDDiscard=tstVDDiscard.vd \
-         tstVDShareable=tstVDShareable.vd
-  TSTVDIO_BUILTIN_TEST_NAMES := $(foreach test,$(TSTVDIO_BUILTIN_TESTS),$(firstword $(subst =,$(SPACE) ,$(test))))
-  TSTVDIO_PATH_TESTS := $(PATH_SUB_CURRENT)
+ #
+ # VD I/O test scripts to built in -> .cpp
+ #
+ TSTVDIO_BUILTIN_TESTS_FILE = $(tstVDIo_0_OUTDIR)/BuiltinTests.cpp
+ TSTVDIO_BUILTIN_TESTS := \
+        tstVDIo=tstVDIo.vd \
+        tstVDResize=tstVDResize.vd \
+        tstVDCompact=tstVDCompact.vd \
+        tstVDCopy=tstVDCopy.vd \
+        tstVDDiscard=tstVDDiscard.vd \
+        tstVDShareable=tstVDShareable.vd
+ TSTVDIO_BUILTIN_TEST_NAMES := $(foreach test,$(TSTVDIO_BUILTIN_TESTS),$(firstword $(subst =,$(SPACE) ,$(test))))
+ TSTVDIO_PATH_TESTS := $(PATH_SUB_CURRENT)
 
-  # 1=name, 2=filter
-  TSTVDIO_GEN_TEST_MACRO = 'TSTVDIOTESTENTRY const g_a$(1)[] =' '{' \
+ # 1=name, 2=filter
+ TSTVDIO_GEN_TEST_MACRO = 'TSTVDIOTESTENTRY const g_a$(1)[] =' '{' \
         $(foreach testnm,$(filter $(2),$(TSTVDIO_BUILTIN_TEST_NAMES)), '    TSTVDIOTESTENTRY_GEN(g_ab$(testnm)),') \
         '};' 'unsigned const g_c$(1) = RT_ELEMENTS(g_a$(1));' '' ''
 
-  $$(TSTVDIO_BUILTIN_TESTS_FILE): $(MAKEFILE_CURRENT) \
+ $$(TSTVDIO_BUILTIN_TESTS_FILE): $(MAKEFILE_CURRENT) \
                 $(foreach test,$(TSTVDIO_BUILTIN_TESTS),$(TSTVDIO_PATH_TESTS)/$(lastword $(subst =,$(SPACE) ,$(test)))) \
                 $(VBOX_BIN2C) \
@@ -76 +75 @@
         $(QUIET)$(RM) -f -- $@ [email protected]
         $(QUIET)$(APPEND) -n "$@" \
-        '' \
-        '#include "BuiltinTests.h"' \
+        '' \
+        '#include "BuiltinTests.h"' \
                ''
         $(foreach test,$(TSTVDIO_BUILTIN_TESTS), $(NLTAB)$(VBOX_BIN2C) -ascii --append \
@@ -84 +83 @@
                 "$@")
 
-# Generate certificate lists.
+# Generate test lists.
         $(QUIET)$(APPEND) -n "$@" '' \
                $(call TSTVDIO_GEN_TEST_MACRO,VDIoTests,%) \
 
-  tstVDIo_TEMPLATE = VBOXR3TSTEXE
-  tstVDIo_INCS := $(PATH_SUB_CURRENT)
-  tstVDIo_SOURCES  = tstVDIo.cpp \
-        VDIoBackend.cpp \
-        VDIoBackendMem.cpp \
-        VDMemDisk.cpp \
-        VDIoRnd.cpp \
-        VDScript.cpp \
-        VDScriptAst.cpp \
-        VDScriptChecker.cpp \
-        VDScriptInterp.cpp \
-        $(TSTVDIO_BUILTIN_TESTS_FILE)
-  tstVDIo_LIBS = \
-        $(LIB_DDU) \
+ ifn1of ($(KBUILD_TARGET), win)
+  VBOX_TSTVDIO_WITH_LOG_REPLAY = 1
+ endif
+
+ tstVDIo_TEMPLATE = VBOXR3TSTEXE
+ tstVDIo_INCS := $(PATH_SUB_CURRENT)
+
+ ifdef VBOX_TSTVDIO_WITH_LOG_REPLAY
+  tstVDIo_DEFS += VBOX_TSTVDIO_WITH_LOG_REPLAY
+ endif
+
+ tstVDIo_SOURCES  = tstVDIo.cpp \
+        VDIoBackend.cpp \
+        VDIoBackendMem.cpp \
+        VDMemDisk.cpp \
+        VDIoRnd.cpp \
+        VDScript.cpp \
+        VDScriptAst.cpp \
+        VDScriptChecker.cpp \
+        VDScriptInterp.cpp \
+        $(TSTVDIO_BUILTIN_TESTS_FILE)
+ tstVDIo_LIBS = \
+        $(LIB_DDU)
+
+ ifdef VBOX_TSTVDIO_WITH_LOG_REPLAY
+  tstVDIo_LIBS += \
         $(PATH_STAGE_LIB)/StorageDbgLib$(VBOX_SUFF_LIB)
  endif

trunk/src/VBox/Storage/testcase/tstVDIo.cpp

@@ -18 +18 @@
 #define LOGGROUP LOGGROUP_DEFAULT
 #include <VBox/vd.h>
-#include <VBox/vddbg.h>
 #include <VBox/err.h>
 #include <VBox/log.h>
@@ -35 +34 @@
 #include <iprt/test.h>
 #include <iprt/system.h>
+
+#ifdef VBOX_TSTVDIO_WITH_LOG_REPLAY
+# include <VBox/vddbg.h>
+#endif
 
 #include "VDMemDisk.h"
@@ -238 +241 @@
 static DECLCALLBACK(int) vdScriptHandlerClose(PVDSCRIPTARG paScriptArgs, void *pvUser);
 static DECLCALLBACK(int) vdScriptHandlerPrintFileSize(PVDSCRIPTARG paScriptArgs, void *pvUser);
-static DECLCALLBACK(int) vdScriptHandlerIoLogReplay(PVDSCRIPTARG paScriptArgs, void *pvUser);
 static DECLCALLBACK(int) vdScriptHandlerIoRngCreate(PVDSCRIPTARG paScriptArgs, void *pvUser);
 static DECLCALLBACK(int) vdScriptHandlerIoRngDestroy(PVDSCRIPTARG paScriptArgs, void *pvUser);
@@ -256 +258 @@
 static DECLCALLBACK(int) vdScriptHandlerSetFileBackend(PVDSCRIPTARG paScriptArgs, void *pvUser);
 
+#ifdef VBOX_TSTVDIO_WITH_LOG_REPLAY
+static DECLCALLBACK(int) vdScriptHandlerIoLogReplay(PVDSCRIPTARG paScriptArgs, void *pvUser);
+#endif
+
 /* create action */
 const VDSCRIPTTYPE g_aArgCreate[] =
@@ -357 +363 @@
 };
 
+#ifdef VBOX_TSTVDIO_WITH_LOG_REPLAY
 /* print file size action */
 const VDSCRIPTTYPE g_aArgIoLogReplay[] =
@@ -363 +370 @@
     VDSCRIPTTYPE_STRING  /* iolog */
 };
+#endif
 
 /* I/O RNG create action */
@@ -472 +480 @@
     {"close",                      VDSCRIPTTYPE_VOID, g_aArgClose,                       RT_ELEMENTS(g_aArgClose),                      vdScriptHandlerClose},
     {"printfilesize",              VDSCRIPTTYPE_VOID, g_aArgPrintFileSize,               RT_ELEMENTS(g_aArgPrintFileSize),              vdScriptHandlerPrintFileSize},
+#ifdef VBOX_TSTVDIO_WITH_LOG_REPLAY
     {"ioreplay",                   VDSCRIPTTYPE_VOID, g_aArgIoLogReplay,                 RT_ELEMENTS(g_aArgIoLogReplay),                vdScriptHandlerIoLogReplay},
+#endif
     {"merge",                      VDSCRIPTTYPE_VOID, g_aArgMerge,                       RT_ELEMENTS(g_aArgMerge),                      vdScriptHandlerMerge},
     {"compact",                    VDSCRIPTTYPE_VOID, g_aArgCompact,                     RT_ELEMENTS(g_aArgCompact),                    vdScriptHandlerCompact},
@@ -1393 +1403 @@
 
 
+#ifdef VBOX_TSTVDIO_WITH_LOG_REPLAY
 static DECLCALLBACK(int) vdScriptHandlerIoLogReplay(PVDSCRIPTARG paScriptArgs, void *pvUser)
 {
@@ -1543 +1554 @@
     return rc;
 }
+#endif