[lit] Fix test shtest-timeout.py for modern output

Update the CHECK lines in the shtest-timeout.py lit test to account for
the current output. The output has been changed in r271610 without
adjusting the tests.

Differential Revision: https://reviews.llvm.org/D25236

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@284057 91177308-0d34-0410-b5e6-96231b3b80d8

utils/lit/tests/shtest-timeout.py

@@ -22,27 +22,26 @@
 # RUN: FileCheck  --check-prefix=CHECK-OUT-COMMON < %t.intsh.out %s
 # RUN: FileCheck --check-prefix=CHECK-INTSH-OUT < %t.intsh.out %s
 # RUN: FileCheck --check-prefix=CHECK-INTSH-ERR < %t.intsh.err %s
-#
+
 # CHECK-INTSH-OUT: TIMEOUT: per_test_timeout :: infinite_loop.py
-# CHECK-INTSH-OUT: Command 0 Reached Timeout: True
-# CHECK-INTSH-OUT: Command 0 Output:
+# CHECK-INTSH-OUT: command output:
 # CHECK-INTSH-OUT-NEXT: Running infinite loop
-
+# CHECK-INTSH-OUT: command reached timeout: True
 
 # CHECK-INTSH-OUT: TIMEOUT: per_test_timeout :: quick_then_slow.py
 # CHECK-INTSH-OUT: Timeout: Reached timeout of 1 seconds
 # CHECK-INTSH-OUT: Command Output
-# CHECK-INTSH-OUT: Command 0 Reached Timeout: False
-# CHECK-INTSH-OUT: Command 0 Output:
+# CHECK-INTSH-OUT: command output:
 # CHECK-INTSH-OUT-NEXT: Running in quick mode
-# CHECK-INTSH-OUT: Command 1 Reached Timeout: True
-# CHECK-INTSH-OUT: Command 1 Output:
+# CHECK-INTSH-OUT: command reached timeout: False
+# CHECK-INTSH-OUT: command output:
 # CHECK-INTSH-OUT-NEXT: Running in slow mode
+# CHECK-INTSH-OUT: command reached timeout: True
 
 # CHECK-INTSH-OUT: TIMEOUT: per_test_timeout :: slow.py
-# CHECK-INTSH-OUT: Command 0 Reached Timeout: True
-# CHECK-INTSH-OUT: Command 0 Output:
+# CHECK-INTSH-OUT: command output:
 # CHECK-INTSH-OUT-NEXT: Running slow program
+# CHECK-INTSH-OUT: command reached timeout: True
 
 # CHECK-INTSH-ERR: Using internal shell