This is an archive of the discontinued LLVM Phabricator instance.

Differential D25236

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

Authored by mgorny on Oct 4 2016, 7:26 AM.

Details

Reviewers
modocache
beanz
• ddunbar
delcypher
Commits
rG1d62f4ab15bc: [lit] Fix test shtest-timeout.py for modern output
rL284057: [lit] Fix test shtest-timeout.py for modern output
Summary

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
adjust the tests.

Diff Detail

Repository
rL LLVM

Event Timeline

mgorny updated this revision to Diff 73475.Oct 4 2016, 7:26 AM
mgorny retitled this revision from to [lit] Fix test shtest-timeout.py for modern output.
mgorny updated this object.
mgorny added reviewers: • ddunbar, delcypher.
mgorny added a subscriber: llvm-commits.
Herald added a subscriber: modocache. · View Herald TranscriptOct 4 2016, 7:26 AM
mgorny added reviewers: modocache, beanz.Oct 12 2016, 12:09 AM
modocache mentioned this in D25195: [lit] Fix FormatError on individual test timeout.Oct 12 2016, 7:42 AM
modocache edited edge metadata.

Thank you! I applied this and D25195 locally, and confirmed that they fix a failure I've been seeing in shtest-timeout.py. Thanks, @mgorny!

modocache accepted this revision.Oct 12 2016, 7:43 AM
modocache edited edge metadata.
This revision is now accepted and ready to land.Oct 12 2016, 7:43 AM
Closed by commit rL284057: [lit] Fix test shtest-timeout.py for modern output (authored by mgorny). · Explain WhyOct 12 2016, 2:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
utils/
lit/
tests/
19 lines

Diff 74444

llvm/trunk/utils/lit/tests/shtest-timeout.py

Show All 16 Lines
# RUN: %{inputs}/shtest-timeout/infinite_loop.py \ # RUN: %{inputs}/shtest-timeout/infinite_loop.py \
# RUN: %{inputs}/shtest-timeout/quick_then_slow.py \ # RUN: %{inputs}/shtest-timeout/quick_then_slow.py \
# RUN: %{inputs}/shtest-timeout/short.py \ # RUN: %{inputs}/shtest-timeout/short.py \
# RUN: %{inputs}/shtest-timeout/slow.py \ # RUN: %{inputs}/shtest-timeout/slow.py \
# RUN: -j 1 -v --debug --timeout 1 --param external=0 > %t.intsh.out 2> %t.intsh.err # RUN: -j 1 -v --debug --timeout 1 --param external=0 > %t.intsh.out 2> %t.intsh.err
# RUN: FileCheck --check-prefix=CHECK-OUT-COMMON < %t.intsh.out %s # 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-OUT < %t.intsh.out %s
# RUN: FileCheck --check-prefix=CHECK-INTSH-ERR < %t.intsh.err %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: TIMEOUT: per_test_timeout :: infinite_loop.py
# CHECK-INTSH-OUT: Command 0 Reached Timeout: True # CHECK-INTSH-OUT: command output:
# CHECK-INTSH-OUT: Command 0 Output:
# CHECK-INTSH-OUT-NEXT: Running infinite loop # 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: per_test_timeout :: quick_then_slow.py
# CHECK-INTSH-OUT: Timeout: Reached timeout of 1 seconds # CHECK-INTSH-OUT: Timeout: Reached timeout of 1 seconds
# CHECK-INTSH-OUT: Command Output # CHECK-INTSH-OUT: Command Output
# CHECK-INTSH-OUT: Command 0 Reached Timeout: False # CHECK-INTSH-OUT: command output:
# CHECK-INTSH-OUT: Command 0 Output:
# CHECK-INTSH-OUT-NEXT: Running in quick mode # CHECK-INTSH-OUT-NEXT: Running in quick mode
# CHECK-INTSH-OUT: Command 1 Reached Timeout: True # CHECK-INTSH-OUT: command reached timeout: False
# CHECK-INTSH-OUT: Command 1 Output: # CHECK-INTSH-OUT: command output:
# CHECK-INTSH-OUT-NEXT: Running in slow mode # 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: TIMEOUT: per_test_timeout :: slow.py
# CHECK-INTSH-OUT: Command 0 Reached Timeout: True # CHECK-INTSH-OUT: command output:
# CHECK-INTSH-OUT: Command 0 Output:
# CHECK-INTSH-OUT-NEXT: Running slow program # CHECK-INTSH-OUT-NEXT: Running slow program
# CHECK-INTSH-OUT: command reached timeout: True
# CHECK-INTSH-ERR: Using internal shell # CHECK-INTSH-ERR: Using internal shell
# Test per test timeout set via a config file rather than on the command line # Test per test timeout set via a config file rather than on the command line
# RUN: not %{lit} \ # RUN: not %{lit} \
# RUN: %{inputs}/shtest-timeout/infinite_loop.py \ # RUN: %{inputs}/shtest-timeout/infinite_loop.py \
# RUN: %{inputs}/shtest-timeout/quick_then_slow.py \ # RUN: %{inputs}/shtest-timeout/quick_then_slow.py \
# RUN: %{inputs}/shtest-timeout/short.py \ # RUN: %{inputs}/shtest-timeout/short.py \
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines