[MERGE chakra-core#4413 @aneeshdk] RL: Apply the timeout to all tests

aneeshdk · aneeshdk · commit c203d182fca4 · 2017-12-12T16:07:00.000-08:00
Merge pull request chakra-core#4413 from aneeshdk:RLTimeoutFixRel In the PR chakra-core#4384 the timeout value was geting applied to only those test cases which has timeout entries in the xml. But from the Nightly runs it looks like tests without a timoeut entry can also timeout. So making this change to apply the timeout to all tests.
diff --git a/bin/rl/rl.cpp b/bin/rl/rl.cpp
@@ -3499,16 +3499,14 @@ GetTestInfoFromNode
                   return FALSE;
                }
 
-               if (TestTimeout != NULL)
-               {
-                   // Overriding the timeout value with the command line value
-                   testInfo->data[i] = TestTimeout;
-               }
             }
-
-            
          }
       }
+      if (i == TIK_TIMEOUT && TestTimeout != NULL)
+      {
+          // Overriding the timeout value with the command line value
+          testInfo->data[i] = TestTimeout;
+      }
    }
 
    return TRUE;

Original file line number	Diff line number	Diff line change
`@@ -3499,16 +3499,14 @@ GetTestInfoFromNode`
`3499`	`3499`	`return FALSE;`
`3500`	`3500`	`}`
`3501`	`3501`
`3502`		`- if (TestTimeout != NULL)`
`3503`		`- {`
`3504`		`- // Overriding the timeout value with the command line value`
`3505`		`- testInfo->data[i] = TestTimeout;`
`3506`		`- }`
`3507`	`3502`	`}`
`3508`		`-`
`3509`		`-`
`3510`	`3503`	`}`
`3511`	`3504`	`}`
	`3505`	`+ if (i == TIK_TIMEOUT && TestTimeout != NULL)`
	`3506`	`+ {`
	`3507`	`+ // Overriding the timeout value with the command line value`
	`3508`	`+ testInfo->data[i] = TestTimeout;`
	`3509`	`+ }`
`3512`	`3510`	`}`
`3513`	`3511`
`3514`	`3512`	`return TRUE;`