From 1ca666886f48401e603404e8c932028edcab05a8 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 25 Apr 2018 17:30:00 +0000 Subject: Revert r330755 "[lit] Report line number for failed RUN command" It is causing many tests to fail on Windows buildbots: http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/10211 llvm-svn: 330848 --- llvm/utils/lit/tests/unit/TestRunner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'llvm/utils/lit/tests/unit/TestRunner.py') diff --git a/llvm/utils/lit/tests/unit/TestRunner.py b/llvm/utils/lit/tests/unit/TestRunner.py index b3988b0c197..874bf275d4e 100644 --- a/llvm/utils/lit/tests/unit/TestRunner.py +++ b/llvm/utils/lit/tests/unit/TestRunner.py @@ -47,7 +47,7 @@ class TestIntegratedTestKeywordParser(unittest.TestCase): @staticmethod def make_parsers(): - def custom_parse(line_number, line, output, keyword): + def custom_parse(line_number, line, output): if output is None: output = [] output += [part for part in line.split(' ') if part.strip()] @@ -99,8 +99,8 @@ class TestIntegratedTestKeywordParser(unittest.TestCase): cmd_parser = self.get_parser(parsers, 'MY_RUN:') value = cmd_parser.getValue() self.assertEqual(len(value), 2) # there are only two run lines - self.assertEqual(value[0].strip(), ": 'MY_RUN: at line 4'; baz") - self.assertEqual(value[1].strip(), ": 'MY_RUN: at line 7'; foo bar") + self.assertEqual(value[0].strip(), 'baz') + self.assertEqual(value[1].strip(), 'foo bar') def test_custom(self): parsers = self.make_parsers() -- cgit v1.2.3