Changeset 50351 in vbox

Timestamp:

Feb 6, 2014 4:21:03 PM (11 years ago)

Author:

vboxsync

Message:

Main/testcase/tstOVF: fixes to make it work reliably (biggest problem was a broken ovf file which needed fixing, rest is cleanup and proper exit code handling), making it work on the testboxes

Location:

trunk/src/VBox/Main/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• ovf-winxp-vbox-sharedfolders/winxp.ovf (modified) (1 diff)
• tstOVF.cpp (modified) (6 diffs)

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

@@ -87 +87 @@
 INSTALLS += ovf-testcases
 ovf-testcases_MODE = a+r,u+w
-ovf-testcases_INST = $(INST_BIN)ovf-testcases/
+ovf-testcases_INST = $(INST_TESTCASE)ovf-testcases/
 ovf-testcases_SOURCES = \
         ovf-dummy.vmdk \

trunk/src/VBox/Main/testcase/ovf-winxp-vbox-sharedfolders/winxp.ovf

@@ -300 +300 @@
         <StorageController name="IDE Controller" type="PIIX3" PortCount="2" useHostIOCache="true">
           <AttachedDevice type="HardDisk" port="0" device="0">
-            <Image uuid="{cf2b9350-4d5f-42a2-be70-b85a00c2ec9f}"/>
+            <Image uuid="{1fc3c37e-079b-477b-a6d7-84c0e8a717ac}"/>
           </AttachedDevice>
           <AttachedDevice type="HardDisk" port="0" device="1">

trunk/src/VBox/Main/testcase/tstOVF.cpp

@@ -85 +85 @@
 {
     char szAbsOVF[RTPATH_MAX];
-    RTPathAbs(pcszOVF0, szAbsOVF, sizeof(szAbsOVF));
+    RTPathExecDir(szAbsOVF, sizeof(szAbsOVF));
+    RTPathAppend(szAbsOVF, sizeof(szAbsOVF), pcszOVF0);
 
     RTPrintf("%s: reading appliance \"%s\"...\n", pcszPrefix, szAbsOVF);
@@ -266 +267 @@
                         const char *pcszDest)
 {
+    char szSrc[RTPATH_MAX];
+    char szDst[RTPATH_MAX];
+    RTPathExecDir(szSrc, sizeof(szSrc));
+    RTPathAppend(szSrc, sizeof(szSrc), "ovf-testcases/ovf-dummy.vmdk");
+    RTPathExecDir(szDst, sizeof(szDst));
+    RTPathAppend(szDst, sizeof(szDst), pcszDest);
     RTPrintf("%s: copying ovf-dummy.vmdk to \"%s\"...\n", pcszPrefix, pcszDest);
 
-    int vrc = RTFileCopy("ovf-testcases/ovf-dummy.vmdk", pcszDest);
+    int vrc = RTFileCopy(szSrc, szDst);
     if (RT_FAILURE(vrc)) throw MyError(0, Utf8StrFmt("Cannot copy ovf-dummy.vmdk to %s: %Rra\n", pcszDest, vrc).c_str());
-    llFiles2Delete.push_back(pcszDest);
+    llFiles2Delete.push_back(szDst);
 }
 
@@ -283 +290 @@
     RTR3InitExe(argc, &argv, 0);
 
+    RTEXITCODE rcExit = RTEXITCODE_SUCCESS;
     HRESULT rc = S_OK;
 
@@ -329 +337 @@
         rc = e.m_rc;
         RTPrintf("%s", e.m_str.c_str());
+        rcExit = RTEXITCODE_FAILURE;
     }
 
@@ -361 +370 @@
         rc = e.m_rc;
         RTPrintf("%s", e.m_str.c_str());
+        rcExit = RTEXITCODE_FAILURE;
     }
 
@@ -377 +387 @@
     RTPrintf("Shutting down COM...\n");
     com::Shutdown();
-    RTPrintf ("tstOVF all done!\n");
-
-    return rc;
+    RTPrintf("tstOVF all done: %s\n", rcExit ? "ERROR" : "SUCCESS");
+
+    return rcExit;
 }