From 7a8aed281b2ad9a2870f758a5ccc168397b55147 Mon Sep 17 00:00:00 2001 From: Michal Gorny Date: Wed, 12 Oct 2016 21:40:08 +0000 Subject: [PATCH] [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 llvm-svn: 284057 --- utils/lit/tests/shtest-timeout.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/utils/lit/tests/shtest-timeout.py b/utils/lit/tests/shtest-timeout.py index e6b2947a4f7..87f431de250 100644 --- a/utils/lit/tests/shtest-timeout.py +++ b/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-NEXT: Running infinite loop +# CHECK-INTSH-OUT: TIMEOUT: per_test_timeout :: infinite_loop.py +# 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