Added -timeoutRetries to rl (and some drive-by cleanup)

bin/rl/rl.cpp

@@ -273,6 +273,7 @@ const char * const TestInfoKindName[] =
    "env",
    "command",
    "timeout",
+   "timeoutRetries",
    "sourcepath",
    "eol-normalization",
    "custom-config-file",
@@ -315,34 +316,34 @@ char *CL, *_CL_;
 const char *JCBinary = "jshost.exe";
 
 BOOL FStatus = TRUE;
-char *StatusPrefix;
-const char *StatusFormat;
+char *StatusPrefix = nullptr;
+const char *StatusFormat = nullptr;
 
-BOOL FVerbose;
-BOOL FQuiet;
-BOOL FNoWarn;
-BOOL FTest;
+BOOL FVerbose = FALSE;
+BOOL FQuiet = FALSE;
+BOOL FNoWarn = FALSE;
+BOOL FTest = FALSE;
 BOOL FStopOnError = FALSE;
 BOOL GStopDueToError = FALSE;
-BOOL FLow;
-BOOL FNoDelete;
-BOOL FCopyOnFail;
+BOOL FLow = FALSE;
+BOOL FNoDelete = FALSE;
+BOOL FCopyOnFail = FALSE;
 BOOL FSummary = TRUE;
-BOOL FMoveDiffs;
-BOOL FNoMoveDiffsSwitch;
-BOOL FRelativeLogPath;
+BOOL FMoveDiffs = FALSE;
+BOOL FNoMoveDiffsSwitch = FALSE;
+BOOL FRelativeLogPath = FALSE;
 BOOL FNoDirName = TRUE;
-BOOL FBaseline;
+BOOL FBaseline = FALSE;
 BOOL FRebase = FALSE;
-BOOL FDiff;
-BOOL FBaseDiff;
-BOOL FSyncEnumDirs;
+BOOL FDiff = FALSE;
+BOOL FBaseDiff = FALSE;
+BOOL FSyncEnumDirs = FALSE;
 BOOL FNogpfnt = TRUE;
-BOOL FAppend;
+BOOL FAppend = FALSE;
 BOOL FAppendTestNameToExtraCCFlags = FALSE;
 
 #ifndef NODEBUG
-BOOL FDebug;
+BOOL FDebug = FALSE;
 #endif
 
 // Output synchronization options
@@ -364,7 +365,6 @@ RLMODE Mode = DEFAULT_RLMODE;
 char *DCFGfile = NULL;
 char const *CFGfile = NULL;
 char const *CMDfile = NULL;
-int CFGline;
 
 #define MAX_ALLOWED_THREADS 10 // must be <= MAXIMUM_WAIT_OBJECTS (64)
 unsigned NumberOfThreads = 0;
@@ -376,15 +376,17 @@ BOOL FNoProgramOutput = FALSE;
 BOOL FOnlyAssertOutput = FALSE;
 BOOL FExcludeDirs = FALSE;
 BOOL FGenLst = FALSE;
-char *ResumeDir, *MatchDir;
+char *ResumeDir = nullptr;
+char *MatchDir = nullptr;
 
 TIME_OPTION Timing = TIME_DIR | TIME_TEST; // Default to report times at test and directory level
 
-static const char *ProgramName;
-static const char *LogName;
-static const char *FullLogName;
-static const char *ResultsLogName;
-static const char *TestTimeout; // Stores timeout in seconds for all tests
+static const char *ProgramName = nullptr;
+static const char *LogName = nullptr;
+static const char *FullLogName = nullptr;
+static const char *ResultsLogName = nullptr;
+static const char *TestTimeout = nullptr; // Stores timeout in seconds for all tests
+static const char *TestTimeoutRetries = nullptr; // Number of timeout retries for all tests
 
 // NOTE: this might be unused now
 static char TempPath[MAX_PATH] = ""; // Path for temporary files
@@ -2474,6 +2476,7 @@ WriteEnvLst
              NULL,
              NULL,
              NULL,
+             NULL,
              NULL
          };
 
@@ -2994,6 +2997,11 @@ ParseArg(
              break;
          }
 
+         if (!_stricmp(&arg[1], "timeoutRetries")) {
+             TestTimeoutRetries = ComplainIfNoArg(arg, s);
+             break;
+         }
+
 #ifndef NODEBUG
          if (!_stricmp(&arg[1], "debug")) {
             FDebug = FVerbose = TRUE;
@@ -3540,6 +3548,32 @@ IsTimeoutStringValid(const char *strTimeout)
     return TRUE;
 }
 
+BOOL
+IsTimeoutRetriesStringValid(const char *strTimeoutRetries)
+{
+    char *end;
+    _set_errno(0);
+
+    uint32 numRetries = strtoul(strTimeoutRetries, &end, 10);
+
+    if (errno != 0 || *end != 0)
+    {
+        return FALSE;
+    }
+
+    // We will not be doing any math with this value, so no need to check for overflow.
+    // However, large values will possibly result in an unacceptably long retry loop,
+    // (especially with the default timeout being multiple minutes long),
+    // so limit the number of retries to some arbitrary max.
+
+    if (numRetries > 100)
+    {
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
 uint32 GetTimeoutValue(const char *strTimeout)
 {
     if (strTimeout == nullptr)
@@ -3606,13 +3640,26 @@ GetTestInfoFromNode
                 if (i == TIK_TIMEOUT)
                 {
                     // 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])) {
+                    if (!IsTimeoutStringValid(testInfo->data[i]))
+                    {
                         CFG_ERROR_EX(fileName, node->LineNumber,
                             "Invalid timeout specified. Cannot parse or too large.\n", nullptr);
                         childNode->Dump();
                         return FALSE;
                     }
                 }
+
+                if (i == TIK_TIMEOUT_RETRIES)
+                {
+                    // Validate the timeoutRetries string now to fail early so we don't run any tests when there is an error.
+                    if (!IsTimeoutRetriesStringValid(testInfo->data[i]))
+                    {
+                        CFG_ERROR_EX(fileName, node->LineNumber,
+                            "Invalid number of timeout retries specified. Value must be numeric and <= 100.\n", nullptr);
+                        childNode->Dump();
+                        return FALSE;
+                    }
+                }
             }
         }
 
@@ -3626,6 +3673,17 @@ GetTestInfoFromNode
                 testInfo->data[i] = TestTimeout;
             }
         }
+
+        if (i == TIK_TIMEOUT_RETRIES && TestTimeoutRetries != nullptr)
+        {
+            // Overriding the timeoutRetries value with the command line value (if the command line value is larger)
+            uint32 xmlTimeoutRetriesValue = GetTimeoutValue(testInfo->data[i]);
+            uint32 testTimeoutRetriesValue = GetTimeoutValue(TestTimeoutRetries);
+            if (xmlTimeoutRetriesValue < testTimeoutRetriesValue)
+            {
+                testInfo->data[i] = TestTimeoutRetries;
+            }
+        }
     }
 
     return TRUE;

bin/rl/rl.h

@@ -167,6 +167,7 @@ extern RLMODE Mode;
 #define DEFAULT_EXEC_TESTS_FLAGS ";"
 
 #define DEFAULT_TEST_TIMEOUT 60000
+#define DEFAULT_TEST_TIMEOUT_RETRIES 0
 
 #define DIR_LOCKFILE  "regrlock.txt"
 
@@ -203,6 +204,7 @@ enum TestInfoKind
    TIK_ENV,
    TIK_COMMAND,
    TIK_TIMEOUT,
+   TIK_TIMEOUT_RETRIES,
    TIK_SOURCE_PATH,
    TIK_EOL_NORMALIZATION,
    TIK_CUSTOM_CONFIG_FILE,
@@ -998,7 +1000,12 @@ extern int ExecTest(CDirectory* pDir, Test * pTest, TestVariant * pTestVariant);
 
 // rlmp.cpp
 
-extern int ExecuteCommand(const char* path, const char* CommandLine, DWORD millisecTimeout = INFINITE, void* localEnvVars = NULL);
+extern int ExecuteCommand(
+    const char* path,
+    const char* CommandLine,
+    DWORD millisecTimeout = INFINITE,
+    uint32 timeoutRetries = 0,
+    void* envFlags = NULL);
 
 extern int DoOneExternalTest(
     CDirectory* pDir,
@@ -1012,7 +1019,9 @@ extern int DoOneExternalTest(
     BOOL fCleanBefore,
     BOOL fCleanAfter,
     BOOL fSuppressNoGPF,
-    void *localEnvVars = NULL
+    DWORD millisecTimeout = INFINITE,
+    uint32 timeoutRetries = 0,
+    void *envFlags = NULL
 );
 
 extern void

bin/rl/rlmp.cpp

@@ -557,10 +557,11 @@ int
 ExecuteCommand(
     const char* path,
     const char* CommandLine,
-    DWORD millisecTimeout,
-    void* envFlags)
+    DWORD millisecTimeout /* = INFINITE */,
+    uint32 timeoutRetries /* = 0 */,
+    void* envFlags /* = NULL */)
 {
-    int rc;
+    int rc = 0;
     FILE* childOutput = NULL;
     char putEnvStr[BUFFER_SIZE];
     char ExecuteProgramCmdLine[BUFFER_SIZE];
@@ -568,37 +569,62 @@ ExecuteCommand(
 
     prevmode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
 
-    // Always flush output buffers before executing a command. Note: this
-    // shouldn't really be necessary because all output should be buffered
-    // by the COutputBuffer class on a per-thread basis.
-    fflush(stdout);
-    fflush(stderr);
-
     strcpy_s(ExecuteProgramCmdLine, "cmd.exe /c "); // for .cmd/.bat scripts
     strcat_s(ExecuteProgramCmdLine, CommandLine);
 
-    EnterCriticalSection(&csCurrentDirectory);
+    for (uint32 numTimeouts = 0; numTimeouts <= timeoutRetries; numTimeouts++)
+    {
+        if (numTimeouts != 0)
+        {
+            LogOut("Timeout retry (attempt #%u)...\n", numTimeouts);
+        }
 
-    // If we're doing executable tests, set the TARGET_VM environment variable.
-    // We must do this inside a critical section since the environment is
-    // not thread specific.
+        // Always flush output buffers before executing a command. Note: this
+        // shouldn't really be necessary because all output should be buffered
+        // by the COutputBuffer class on a per-thread basis.
+        fflush(stdout);
+        fflush(stderr);
 
-    if ((Mode == RM_EXE) && TargetVM) {
-        sprintf_s(putEnvStr, "TARGET_VM=%s", TargetVM);
-        _putenv(putEnvStr);
-    }
+        EnterCriticalSection(&csCurrentDirectory);
 
-    rc = _chdir(path);
-    if (rc == 0) {
-        childOutput = PipeSpawn(ExecuteProgramCmdLine, envFlags);
-    }
-    LeaveCriticalSection(&csCurrentDirectory);
+        // If we're doing executable tests, set the TARGET_VM environment variable.
+        // We must do this inside a critical section since the environment is
+        // not thread specific.
+        if ((Mode == RM_EXE) && TargetVM)
+        {
+            sprintf_s(putEnvStr, "TARGET_VM=%s", TargetVM);
+            _putenv(putEnvStr);
+        }
 
-    if (rc != 0) {
-        LogError("Could not change directory to '%s' - errno == %d\n", path, errno);
-    } else if (childOutput != NULL) {
-        rc = FilterThread(childOutput, millisecTimeout);
-        rc = PipeSpawnClose(childOutput, rc == WAIT_TIMEOUT);
+        // Change directory and then spawn child process inside a critical section
+        // because the environment (including CWD) is not thread-specific
+        // and the child process depends on CWD.
+        rc = _chdir(path);
+        if (rc == 0)
+        {
+            childOutput = PipeSpawn(ExecuteProgramCmdLine, envFlags);
+        }
+
+        LeaveCriticalSection(&csCurrentDirectory);
+
+        if (rc != 0)
+        {
+            LogError("Could not change directory to '%s' - errno == %d\n", path, errno);
+        }
+        else if (childOutput != NULL)
+        {
+            rc = FilterThread(childOutput, millisecTimeout);
+            bool timedOut = (rc == WAIT_TIMEOUT);
+            rc = PipeSpawnClose(childOutput, timedOut);
+            if (timedOut)
+            {
+                continue; // retry timed-out command
+            }
+            else
+            {
+                break; // did not timeout, do not retry
+            }
+        }
     }
 
     SetErrorMode(prevmode);

test/rltimeout/expectedfail/rlexe.xml

@@ -24,4 +24,13 @@
       <tags>exclude_dynapogo</tags>
     </default>
   </test>
+  <test>
+    <default>
+      <!-- should timeout after 1 second and retry twice before reporting failure; verify timeout works with command tag tests -->
+      <files>%REGRESS%\mediumrunning.js</files>
+      <timeout>1</timeout>
+      <timeoutRetries>2</timeoutRetries>
+      <tags>exclude_dynapogo</tags>
+    </default>
+  </test>
 </regress-exe>

test/rltimeout/xmlparsefail/rlexe.xml

@@ -33,5 +33,13 @@
       <tags>exclude_dynapogo</tags>
     </default>
   </test>
+  <test>
+    <default>
+      <!- - should fail fast because timeoutRetries is too large (would take too long to run) - ->
+      <files>irrelevant.js</files>
+      <timeoutRetries>101</timeoutRetries>
+      <tags>exclude_dynapogo</tags>
+    </default>
+  </test>
 -->
 </regress-exe>