aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.perf
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2016-01-08 10:22:17 -0500
committerSimon Marchi <simon.marchi@ericsson.com>2016-01-08 10:22:17 -0500
commit582a1b0064b14cb12b18f48678876d32c59c11c8 (patch)
tree350fc2c4df4978026437fcb6b36ed3edf52aabc7 /gdb/testsuite/gdb.perf
parent2f99e8fc9cb84ca80cfca6c119f1f22bbfd2a314 (diff)
downloadgdb-582a1b0064b14cb12b18f48678876d32c59c11c8.zip
gdb-582a1b0064b14cb12b18f48678876d32c59c11c8.tar.gz
gdb-582a1b0064b14cb12b18f48678876d32c59c11c8.tar.bz2
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.
Diffstat (limited to 'gdb/testsuite/gdb.perf')
-rw-r--r--gdb/testsuite/gdb.perf/lib/perftest/perftest.py15
-rw-r--r--gdb/testsuite/gdb.perf/lib/perftest/testresult.py2
2 files changed, 10 insertions, 7 deletions
diff --git a/gdb/testsuite/gdb.perf/lib/perftest/perftest.py b/gdb/testsuite/gdb.perf/lib/perftest/perftest.py
index b78f83b..26d4425 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 <http://www.gnu.org/licenses/>.
-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 4a62cf5..6747dcc 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()