Changeset 33227 in vbox for trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp

Timestamp:

Oct 19, 2010 11:20:51 AM (14 years ago)

Author:

vboxsync

Message:

Storage/vbox-img: return 1 as exit code if anything went wrong

File:

• trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp

@@ -760 +760 @@
         rc = VDCopy(pSrcDisk, VD_LAST_IMAGE, pDstDisk, pszDstFormat,
                     pszDstFilename, false, 0, uImageFlags, NULL,
-                    VD_OPEN_FLAGS_NORMAL, NULL, pIfsImageOutput, NULL);
+                    VD_OPEN_FLAGS_NORMAL | VD_OPEN_FLAGS_SEQUENTIAL, NULL,
+                    pIfsImageOutput, NULL);
         if (RT_FAILURE(rc))
         {
@@ -899 +900 @@
     RTR3Init();
     int rc;
+    int exitcode = 0;
 
     g_pszProgName = RTPathFilename(argv[0]);
@@ -963 +965 @@
     rc = VDInit();
     if (RT_FAILURE(rc))
-        return errorSyntax("Initalizing backends failed! rc=%Rrc\n");
+    {
+        errorSyntax("Initalizing backends failed! rc=%Rrc\n", rc);
+        return 1;
+    }
 
     /*
@@ -990 +995 @@
             handlerArg.argv = &argv[iCmdArg];
 
-            rc = s_commandHandlers[commandIndex].handler(&handlerArg);
+            exitcode = s_commandHandlers[commandIndex].handler(&handlerArg);
             break;
         }
     }
     if (!s_commandHandlers[commandIndex].command)
-        return errorSyntax("Invalid command '%s'", argv[iCmd]);
+    {
+        errorSyntax("Invalid command '%s'", argv[iCmd]);
+        return 1;
+    }
 
     rc = VDShutdown();
     if (RT_FAILURE(rc))
-        return errorSyntax("Unloading backends failed! rc=%Rrc\n", rc);
-
-    return rc;
+    {
+        errorSyntax("Unloading backends failed! rc=%Rrc\n", rc);
+        return 1;
+    }
+
+    return exitcode;
 }