From 582a1b0064b14cb12b18f48678876d32c59c11c8 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 8 Jan 2016 10:22:17 -0500 Subject: [PATCH] perf testsuite: python 3 fixes There are a few errors when trying to run the performance testsuite with Python 3. This commit fixes them. In Python 2, it was possible to use relative imports (importing a module relative to the current one). In Python 3 it isn't. So I use absolute_import from the __future__ module, which allows Python 2 to behave like Python 3, and use the Python 3 syntax. In Python 3, dict.iterkeys doesn't exist anymore. Using dict.keys is a good compromise in this case. gdb/testsuite/ChangeLog: * gdb.perf/lib/perftest/perftest.py: Change relative imports to absolute. (SingleStatisticTestResult.report): Use dict.keys instead of dict.iterkeys. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.perf/lib/perftest/perftest.py | 15 +++++++++------ gdb/testsuite/gdb.perf/lib/perftest/testresult.py | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 959b85bc8f0..6fd6e4f8063 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2016-01-08 Simon Marchi + + * gdb.perf/lib/perftest/perftest.py: Change relative imports to + absolute. + (SingleStatisticTestResult.report): Use dict.keys instead of + dict.iterkeys. + 2016-01-06 Pedro Alves * gdb.python/py-infthread.exp: Fix typo. Expect t0.num to be 1. diff --git a/gdb/testsuite/gdb.perf/lib/perftest/perftest.py b/gdb/testsuite/gdb.perf/lib/perftest/perftest.py index b78f83bda9e..26d4425152d 100644 --- a/gdb/testsuite/gdb.perf/lib/perftest/perftest.py +++ b/gdb/testsuite/gdb.perf/lib/perftest/perftest.py @@ -13,12 +13,15 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import testresult -import reporter -from measure import Measure -from measure import MeasurementCpuTime -from measure import MeasurementWallTime -from measure import MeasurementVmSize +from __future__ import absolute_import + +import perftest.testresult as testresult +import perftest.reporter as reporter +from perftest.measure import Measure +from perftest.measure import MeasurementCpuTime +from perftest.measure import MeasurementWallTime +from perftest.measure import MeasurementVmSize + class TestCase(object): """Base class of all performance testing cases. diff --git a/gdb/testsuite/gdb.perf/lib/perftest/testresult.py b/gdb/testsuite/gdb.perf/lib/perftest/testresult.py index 4a62cf558f8..6747dccee1e 100644 --- a/gdb/testsuite/gdb.perf/lib/perftest/testresult.py +++ b/gdb/testsuite/gdb.perf/lib/perftest/testresult.py @@ -42,7 +42,7 @@ class SingleStatisticTestResult(TestResult): def report(self, reporter, name): reporter.start() - for key in sorted(self.results.iterkeys()): + for key in sorted(self.results.keys()): reporter.report(name, key, self.results[key]) reporter.end() -- 2.30.2