ART: Run Checker with Python >2.6
Chromium buildbots don't have Python 3. This patch fixes the uses
of print() and ASCII vs. Unicode strings to make Checker compatible
with Python 2.6 and above.
Change-Id: Ic065d990f668b8cf95a337aae037699e8474fcee
diff --git a/tools/checker_test.py b/tools/checker_test.py
index 1466b93..18152b5 100755
--- a/tools/checker_test.py
+++ b/tools/checker_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
#
# Copyright (C) 2014 The Android Open Source Project
#
@@ -359,6 +359,8 @@
class TestOutputFile_Parse(unittest.TestCase):
def __parsesTo(self, string, expected):
+ if isinstance(string, str):
+ string = unicode(string)
outputStream = io.StringIO(string)
return self.assertEqual(checker.OutputFile(outputStream).groups, expected)
@@ -421,6 +423,8 @@
class TestCheckFile_Parse(unittest.TestCase):
def __parsesTo(self, string, expected):
+ if isinstance(string, str):
+ string = unicode(string)
checkStream = io.StringIO(string)
return self.assertEqual(checker.CheckFile("CHECK", checkStream).groups, expected)