mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-25 04:02:41 +01:00
[UpdateTestUtils] Print test filename when complaining about conflicting prefix
Now that FileCheck eagerly complains when prefixes are unused, the update script does the same, and is becoming very common to need to drop some prefixes, yet figuring out the file it complains about isn't obvious unless it actually tells us.
This commit is contained in:
parent
21a466ca4d
commit
9acde4873f
@ -291,11 +291,12 @@ class function_body(object):
|
|||||||
return self.scrub
|
return self.scrub
|
||||||
|
|
||||||
class FunctionTestBuilder:
|
class FunctionTestBuilder:
|
||||||
def __init__(self, run_list, flags, scrubber_args):
|
def __init__(self, run_list, flags, scrubber_args, path):
|
||||||
self._verbose = flags.verbose
|
self._verbose = flags.verbose
|
||||||
self._record_args = flags.function_signature
|
self._record_args = flags.function_signature
|
||||||
self._check_attributes = flags.check_attributes
|
self._check_attributes = flags.check_attributes
|
||||||
self._scrubber_args = scrubber_args
|
self._scrubber_args = scrubber_args
|
||||||
|
self._path = path
|
||||||
# Strip double-quotes if input was read by UTC_ARGS
|
# Strip double-quotes if input was read by UTC_ARGS
|
||||||
self._replace_value_regex = list(map(lambda x: x.strip('"'), flags.replace_value_regex))
|
self._replace_value_regex = list(map(lambda x: x.strip('"'), flags.replace_value_regex))
|
||||||
self._func_dict = {}
|
self._func_dict = {}
|
||||||
@ -309,7 +310,7 @@ class FunctionTestBuilder:
|
|||||||
|
|
||||||
def finish_and_get_func_dict(self):
|
def finish_and_get_func_dict(self):
|
||||||
for prefix in self._get_failed_prefixes():
|
for prefix in self._get_failed_prefixes():
|
||||||
warn('Prefix %s had conflicting output from different RUN lines for all functions' % (prefix,))
|
warn('Prefix %s had conflicting output from different RUN lines for all functions in test %s' % (prefix,self._path,))
|
||||||
return self._func_dict
|
return self._func_dict
|
||||||
|
|
||||||
def func_order(self):
|
def func_order(self):
|
||||||
|
@ -115,7 +115,8 @@ def main():
|
|||||||
'function_signature': False,
|
'function_signature': False,
|
||||||
'check_attributes': False,
|
'check_attributes': False,
|
||||||
'replace_value_regex': []}),
|
'replace_value_regex': []}),
|
||||||
scrubber_args = [])
|
scrubber_args = [],
|
||||||
|
path=test)
|
||||||
|
|
||||||
for prefixes, opt_args in prefix_list:
|
for prefixes, opt_args in prefix_list:
|
||||||
common.debug('Extracted opt cmd:', opt_basename, opt_args, file=sys.stderr)
|
common.debug('Extracted opt cmd:', opt_basename, opt_args, file=sys.stderr)
|
||||||
|
@ -275,7 +275,8 @@ def main():
|
|||||||
builder = common.FunctionTestBuilder(
|
builder = common.FunctionTestBuilder(
|
||||||
run_list=filecheck_run_list,
|
run_list=filecheck_run_list,
|
||||||
flags=ti.args,
|
flags=ti.args,
|
||||||
scrubber_args=[])
|
scrubber_args=[],
|
||||||
|
path=ti.path)
|
||||||
|
|
||||||
for prefixes, args, extra_commands, triple_in_cmd in run_list:
|
for prefixes, args, extra_commands, triple_in_cmd in run_list:
|
||||||
# Execute non-filechecked runline.
|
# Execute non-filechecked runline.
|
||||||
|
@ -114,7 +114,8 @@ def main():
|
|||||||
'function_signature': False,
|
'function_signature': False,
|
||||||
'check_attributes': False,
|
'check_attributes': False,
|
||||||
'replace_value_regex': []}),
|
'replace_value_regex': []}),
|
||||||
scrubber_args=[ti.args])
|
scrubber_args=[ti.args],
|
||||||
|
path=ti.path)
|
||||||
|
|
||||||
for prefixes, llc_tool, llc_args, preprocess_cmd, triple_in_cmd, march_in_cmd in run_list:
|
for prefixes, llc_tool, llc_args, preprocess_cmd, triple_in_cmd, march_in_cmd in run_list:
|
||||||
common.debug('Extracted LLC cmd:', llc_tool, llc_args)
|
common.debug('Extracted LLC cmd:', llc_tool, llc_args)
|
||||||
|
@ -113,7 +113,8 @@ def main():
|
|||||||
builder = common.FunctionTestBuilder(
|
builder = common.FunctionTestBuilder(
|
||||||
run_list=prefix_list,
|
run_list=prefix_list,
|
||||||
flags=ti.args,
|
flags=ti.args,
|
||||||
scrubber_args=[])
|
scrubber_args=[],
|
||||||
|
path=ti.path)
|
||||||
|
|
||||||
for prefixes, opt_args, preprocess_cmd in prefix_list:
|
for prefixes, opt_args, preprocess_cmd in prefix_list:
|
||||||
common.debug('Extracted opt cmd: ' + opt_basename + ' ' + opt_args)
|
common.debug('Extracted opt cmd: ' + opt_basename + ' ' + opt_args)
|
||||||
|
Loading…
Reference in New Issue
Block a user