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

Timestamp:

Apr 1, 2015 10:02:41 PM (10 years ago)

Author:

vboxsync

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

99375

Message:

tstVDIo: Hopefully fix errors on testboxes regarding to deep sub test nesting

Location:

trunk/src/VBox/Storage/testcase

Files:

• BuiltinTests.h (modified) (2 diffs)
• Makefile.kmk (modified) (1 diff)
• tstVDIo.cpp (modified) (5 diffs)

trunk/src/VBox/Storage/testcase/BuiltinTests.h

@@ -23 +23 @@
 typedef struct TSTVDIOTESTENTRY
 {
+    /** Test name. */
+    const char             *pszName;
     /** Pointer to the raw bytes. */
     const unsigned char    *pch;
@@ -32 +34 @@
 
 /** Macro for simplifying generating the trust anchor tables. */
-#define TSTVDIOTESTENTRY_GEN(a_abTest)      { &a_abTest[0], sizeof(a_abTest) }
+#define TSTVDIOTESTENTRY_GEN(a_szName, a_abTest)      { #a_szName, &a_abTest[0], sizeof(a_abTest) }
 
 /** All tests we know. */

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

@@ -66 +66 @@
  # 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)),') \
+        $(foreach testnm,$(filter $(2),$(TSTVDIO_BUILTIN_TEST_NAMES)), '    TSTVDIOTESTENTRY_GEN($(testnm), g_ab$(testnm)),') \
         '};' 'unsigned const g_c$(1) = RT_ELEMENTS(g_a$(1));' '' ''
 

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

@@ -972 +972 @@
             tstVDIoTestDestroy(&IoTest);
         }
+        RTTestSubDone(pGlob->hTest);
     }
 
@@ -2694 +2695 @@
  *
  * @returns nothing.
+ * @param   pszName      The script name.
  * @param   pszScript    The script to execute.
  */
-static void tstVDIoScriptExec(const char *pszScript)
+static void tstVDIoScriptExec(const char *pszName, const char *pszScript)
 {
     int rc = VINF_SUCCESS;
@@ -2739 +2741 @@
     AssertRC(rc);
 
-    rc = RTTestCreate("tstVDIo", &GlobTest.hTest);
+    rc = RTTestCreate(pszName, &GlobTest.hTest);
     if (RT_SUCCESS(rc))
     {
@@ -2796 +2798 @@
 
         AssertPtr(pszScript);
-        tstVDIoScriptExec(pszScript);
+        tstVDIoScriptExec(pcszFilename, pszScript);
         RTStrFree(pszScript);
     }
@@ -2835 +2837 @@
 
         AssertPtr(pszScript);
-        tstVDIoScriptExec(pszScript);
+        tstVDIoScriptExec(g_aVDIoTests[i].pszName, pszScript);
     }
 #endif