Changeset 48011 in vbox

Timestamp:

Aug 23, 2013 8:10:06 AM (11 years ago)

Author:

vboxsync

Message:

Main/tstCollector: don't fail if certain functions are not implemented

File:

• trunk/src/VBox/Main/testcase/tstCollector.cpp (modified) (6 diffs)

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

@@ -153 +153 @@
     uint64_t hostRxStop, hostTxStop, speed = 125000000; /* Assume 1Gbit/s */
 
-    RTPrintf("tstCollector: TESTING - Network load, sleeping for 5 sec...\n");
+    RTPrintf("tstCollector: TESTING - Network load, sleeping for 5 s...\n");
 
     hostRxStart = hostTxStart = 0;
@@ -212 +212 @@
 
     int rc = collector->getHostFilesystemUsage(FSNAME, &total, &used, &available);
-    if (RT_FAILURE(rc))
-    {
-        RTPrintf("tstCollector: getHostFilesystemUsage() -> %Rrc\n", rc);
-        return 1;
-    }
-    RTPrintf("tstCollector: host root fs total     = %lu mB\n", total);
-    RTPrintf("tstCollector: host root fs used      = %lu mB\n", used);
-    RTPrintf("tstCollector: host root fs available = %lu mB\n\n", available);
+    if (rc == VERR_NOT_IMPLEMENTED)
+        RTPrintf("tstCollector: getHostFilesystemUsage() not implemented, skipping\n");
+    else
+    {
+        if (RT_FAILURE(rc))
+        {
+            RTPrintf("tstCollector: getHostFilesystemUsage() -> %Rrc\n", rc);
+            return 1;
+        }
+        RTPrintf("tstCollector: host root fs total     = %lu mB\n", total);
+        RTPrintf("tstCollector: host root fs used      = %lu mB\n", used);
+        RTPrintf("tstCollector: host root fs available = %lu mB\n\n", available);
+    }
     return 0;
 }
@@ -257 +262 @@
             rc = collector->getHostDiskSize(it->c_str(), &diskSize);
             RTPrintf("tstCollector: TESTING - Disk size (%s) = %llu\n", it->c_str(), diskSize);
-            if (RT_FAILURE(rc))
+            if (rc == VERR_FILE_NOT_FOUND)
+                RTPrintf("tstCollector: getHostDiskSize(%s) returned VERR_FILE_NOT_FOUND\n", it->c_str());
+            else if (RT_FAILURE(rc))
             {
                 RTPrintf("tstCollector: getHostDiskSize() -> %Rrc\n", rc);
@@ -266 +273 @@
         for (it = disksLoad.begin(); it != disksLoad.end(); ++it)
         {
-            RTPrintf("tstCollector: TESTING - Disk utilization (%s), sleeping for 5 sec...\n", it->c_str());
+            RTPrintf("tstCollector: TESTING - Disk utilization (%s), sleeping for 5 s...\n", it->c_str());
 
             hints.collectHostCpuLoad();
@@ -405 +412 @@
     if (cpuTest)
     {
-        RTPrintf("tstCollector: TESTING - CPU load, sleeping for 5 sec\n");
+        RTPrintf("tstCollector: TESTING - CPU load, sleeping for 5 s...\n");
 
         rc = collector->getRawHostCpuLoad(&hostUserStart, &hostKernelStart, &hostIdleStart);
@@ -459 +466 @@
                  (unsigned)((processKernelStop - processKernelStart) * 10000 / (processTotalStop - processTotalStart) % 100));
 
-        RTPrintf("tstCollector: TESTING - CPU load, looping for 5 sec\n");
+        RTPrintf("tstCollector: TESTING - CPU load, looping for 5 s...\n");
         rc = collector->preCollect(hints, 0);
         if (RT_FAILURE(rc))