aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog7
-rw-r--r--gdb/testsuite/gdb.perf/lib/perftest/perftest.py15
-rw-r--r--gdb/testsuite/gdb.perf/lib/perftest/testresult.py2
3 files changed, 17 insertions, 7 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 959b85b..6fd6e4f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-08 Simon Marchi <simon.marchi@ericsson.com>
+
+ * 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 <palves@redhat.com>
* 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 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()