rl -timeout overrides XML value based on numeric value of argument

Author: dilijev

bin/rl/rl.cpp

@@ -3537,6 +3537,19 @@ IsTimeoutStringValid(const char *strTimeout) {
    return TRUE;
 }
 
+uint32 GetTimeoutValue(const char *strTimeout)
+{
+    if (strTimeout == nullptr)
+    {
+        return 0;
+    }
+
+    char *end = nullptr;
+    _set_errno(0);
+    uint32 secTimeout = strtoul(strTimeout, &end, 10);
+    return secTimeout;
+}
+
 BOOL
 GetTestInfoFromNode
 (
@@ -3592,17 +3605,20 @@ GetTestInfoFromNode
                // Validate the timeout string now to fail early so we don't run any tests when there is an error.
                if (!IsTimeoutStringValid(testInfo->data[i])) {
                   CFG_ERROR_EX(fileName, node->LineNumber,
-                    "Invalid timeout specified. Cannot parse or too large.\n", NULL);
+                     "Invalid timeout specified. Cannot parse or too large.\n", NULL);
                   childNode->Dump();
                   return FALSE;
                }
             }
          }
       }
-      if (i == TIK_TIMEOUT && TestTimeout != NULL)
+
+      if (i == TIK_TIMEOUT && TestTimeout != nullptr)
       {
          // Overriding the timeout value with the command line value (if the command line value is larger)
-         if (testInfo->data[i] < TestTimeout)
+         uint32 xmlTimeoutValue = GetTimeoutValue(testInfo->data[i]);
+         uint32 testTimeoutValue = GetTimeoutValue(TestTimeout);
+         if (xmlTimeoutValue < testTimeoutValue)
          {
             testInfo->data[i] = TestTimeout;
          }