RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 19:52:54 +01:00
Code Issues Projects Releases Wiki Activity

lit: Drop require_and_and support.

Browse Source 
llvm-svn: 86447
This commit is contained in:
Daniel Dunbar 2009-11-08 09:07:13 +00:00
parent 3126c532b2
commit 642e76ff50
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/lit/TestFormats.py
View File

@ -81,14 +81,12 @@ class FileBasedTest(object):
localConfig)
class ShTest(FileBasedTest):
def __init__(self, execute_external = False, require_and_and = False):
def __init__(self, execute_external = False):
self.execute_external = execute_external
self.require_and_and = require_and_and
def execute(self, test, litConfig):
return TestRunner.executeShTest(test, litConfig,
self.execute_external,
self.require_and_and)
self.execute_external)
class TclTest(FileBasedTest):
def execute(self, test, litConfig):

21
utils/lit/TestRunner.py
View File

@ -353,7 +353,7 @@ def isExpectedFail(xfails, xtargets, target_triple):
return True
def parseIntegratedTestScript(test, requireAndAnd):
def parseIntegratedTestScript(test):
"""parseIntegratedTestScript - Scan an LLVM/Clang style integrated test
script and extract the lines to 'RUN' as well as 'XFAIL' and 'XTARGET'
information. The RUN lines also will have variable substitution performed.
@ -425,19 +425,6 @@ def parseIntegratedTestScript(test, requireAndAnd):
if script[-1][-1] == '\\':
return (Test.UNRESOLVED, "Test has unterminated run lines (with '\\')")
# Validate interior lines for '&&', a lovely historical artifact.
if requireAndAnd:
for i in range(len(script) - 1):
ln = script[i]
if not ln.endswith('&&'):
return (Test.FAIL,
("MISSING \'&&\': %s\n" +
"FOLLOWED BY : %s\n") % (ln, script[i + 1]))
# Strip off '&&'
script[i] = ln[:-2]
isXFail = isExpectedFail(xfails, xtargets, test.suite.config.target_triple)
return script,isXFail,tmpBase,execdir
@ -462,7 +449,7 @@ def executeTclTest(test, litConfig):
if test.config.unsupported:
return (Test.UNSUPPORTED, 'Test is unsupported')
res = parseIntegratedTestScript(test, False)
res = parseIntegratedTestScript(test)
if len(res) == 2:
return res
@ -491,11 +478,11 @@ def executeTclTest(test, litConfig):
return formatTestOutput(status, out, err, exitCode, script)
def executeShTest(test, litConfig, useExternalSh, requireAndAnd):
def executeShTest(test, litConfig, useExternalSh):
if test.config.unsupported:
return (Test.UNSUPPORTED, 'Test is unsupported')
res = parseIntegratedTestScript(test, requireAndAnd)
res = parseIntegratedTestScript(test)
if len(res) == 2:
return res