mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-26 04:40:38 +00:00
[lit] Move the shtest-xunit-output check lines into shtest-format
These two tests are operating on the same test suite, which causes them to be racy about writing temporary files and can cause spurious failures. Merge them into one test to avoid the issue. llvm-svn: 337718
This commit is contained in:
Justin Bogner
parent
e9506cf742
commit
586bd2098d
@ -1,8 +1,10 @@
|
||||
# Check the various features of the ShTest format.
|
||||
#
|
||||
# RUN: not %{lit} -j 1 -v %{inputs}/shtest-format > %t.out
|
||||
# RUN: rm -f %t.xml
|
||||
# RUN: not %{lit} -j 1 -v %{inputs}/shtest-format --xunit-xml-output %t.xml > %t.out
|
||||
# RUN: FileCheck < %t.out %s
|
||||
#
|
||||
# RUN: FileCheck --check-prefix=XUNIT < %t.xml %s
|
||||
|
||||
# END.
|
||||
|
||||
# CHECK: -- Testing:
|
||||
@ -84,3 +86,85 @@
|
||||
# CHECK: Unresolved Tests : 3
|
||||
# CHECK: Unexpected Passes : 1
|
||||
# CHECK: Unexpected Failures: 3
|
||||
|
||||
|
||||
# XUNIT: <?xml version="1.0" encoding="UTF-8" ?>
|
||||
# XUNIT-NEXT: <testsuites>
|
||||
# XUNIT-NEXT: <testsuite name="shtest-format" tests="23" failures="7" skipped="5">
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="argv0.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.external_shell" name="fail.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT: <failure{{[ ]*}}>
|
||||
# XUNIT: </failure>
|
||||
# XUNIT-NEXT: </testcase>
|
||||
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.external_shell" name="fail_with_bad_encoding.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT: <failure{{[ ]*}}>
|
||||
# XUNIT: </failure>
|
||||
# XUNIT-NEXT: </testcase>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.external_shell" name="pass.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="fail.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT: <failure{{[ ]*}}>
|
||||
# XUNIT: </failure>
|
||||
# XUNIT-NEXT: </testcase>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="no-test-line.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT: <failure{{[ ]*}}>
|
||||
# XUNIT: </failure>
|
||||
# XUNIT-NEXT: </testcase>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="pass.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="requires-any-missing.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT:<skipped message="Skipping because of: a-missing-feature || a-missing-feature-2" />
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="requires-any-present.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="requires-missing.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT:<skipped message="Skipping because of: a-missing-feature" />
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="requires-present.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="requires-star.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT: <failure{{[ ]*}}>
|
||||
# XUNIT: </failure>
|
||||
# XUNIT-NEXT: </testcase>
|
||||
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="requires-triple.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT:<skipped message="Skipping because of: x86_64" />
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="unsupported-expr-false.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="unsupported-expr-true.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT:<skipped message="Skipping because of configuration." />
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="unsupported-star.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT: <failure{{[ ]*}}>
|
||||
# XUNIT: </failure>
|
||||
# XUNIT-NEXT: </testcase>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.unsupported_dir" name="some-test.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT:<skipped message="Skipping because of configuration." />
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="xfail-expr-false.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="xfail-expr-true.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="xfail-feature.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="xfail-target.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="xfail.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# XUNIT: <testcase classname="shtest-format.shtest-format" name="xpass.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# XUNIT-NEXT: <failure{{[ ]*}}>
|
||||
# XUNIT: </failure>
|
||||
# XUNIT-NEXT: </testcase>
|
||||
|
||||
# XUNIT: </testsuite>
|
||||
# XUNIT-NEXT: </testsuites>
|
||||
|
||||
@ -1,84 +0,0 @@
|
||||
# RUN: rm -f %t.xml
|
||||
# RUN: not %{lit} -j 1 -v %{inputs}/shtest-format --xunit-xml-output %t.xml
|
||||
# RUN: FileCheck < %t.xml %s
|
||||
|
||||
# CHECK: <?xml version="1.0" encoding="UTF-8" ?>
|
||||
# CHECK-NEXT: <testsuites>
|
||||
# CHECK-NEXT: <testsuite name="shtest-format" tests="23" failures="7" skipped="5">
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="argv0.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.external_shell" name="fail.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT: <failure{{[ ]*}}>
|
||||
# CHECK: </failure>
|
||||
# CHECK-NEXT: </testcase>
|
||||
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.external_shell" name="fail_with_bad_encoding.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT: <failure{{[ ]*}}>
|
||||
# CHECK: </failure>
|
||||
# CHECK-NEXT: </testcase>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.external_shell" name="pass.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="fail.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT: <failure{{[ ]*}}>
|
||||
# CHECK: </failure>
|
||||
# CHECK-NEXT: </testcase>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="no-test-line.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT: <failure{{[ ]*}}>
|
||||
# CHECK: </failure>
|
||||
# CHECK-NEXT: </testcase>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="pass.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="requires-any-missing.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT:<skipped message="Skipping because of: a-missing-feature || a-missing-feature-2" />
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="requires-any-present.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="requires-missing.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT:<skipped message="Skipping because of: a-missing-feature" />
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="requires-present.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="requires-star.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT: <failure{{[ ]*}}>
|
||||
# CHECK: </failure>
|
||||
# CHECK-NEXT: </testcase>
|
||||
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="requires-triple.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT:<skipped message="Skipping because of: x86_64" />
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="unsupported-expr-false.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="unsupported-expr-true.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT:<skipped message="Skipping because of configuration." />
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="unsupported-star.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT: <failure{{[ ]*}}>
|
||||
# CHECK: </failure>
|
||||
# CHECK-NEXT: </testcase>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.unsupported_dir" name="some-test.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT:<skipped message="Skipping because of configuration." />
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="xfail-expr-false.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="xfail-expr-true.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="xfail-feature.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="xfail-target.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="xfail.txt" time="{{[0-9]+\.[0-9]+}}"/>
|
||||
|
||||
# CHECK: <testcase classname="shtest-format.shtest-format" name="xpass.txt" time="{{[0-9]+\.[0-9]+}}">
|
||||
# CHECK-NEXT: <failure{{[ ]*}}>
|
||||
# CHECK: </failure>
|
||||
# CHECK-NEXT: </testcase>
|
||||
|
||||
# CHECK: </testsuite>
|
||||
# CHECK-NEXT: </testsuites>
|
||||
Loading…
Reference in New Issue
Block a user