[RFA,2/2] Fix py-value.exp failure on Python 3

Message ID 1477951905-14880-3-git-send-email-tom@tromey.com
State New, archived
Headers

Commit Message

Tom Tromey Oct. 31, 2016, 10:11 p.m. UTC
  I happened to notice that one test in py-value.exp did not work
properly with Python 3.  This patch fixes the problem.

2016-10-31  Tom Tromey  <tom@tromey.com>

	* gdb.python/py-value.exp (test_value_creation): Make "long" test
	depend on Python 2.
---
 gdb/testsuite/ChangeLog               | 5 +++++
 gdb/testsuite/gdb.python/py-value.exp | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
  

Comments

Pedro Alves Nov. 8, 2016, 1:09 p.m. UTC | #1
On 10/31/2016 10:11 PM, Tom Tromey wrote:
> I happened to notice that one test in py-value.exp did not work
> properly with Python 3.  This patch fixes the problem.
> 
> 2016-10-31  Tom Tromey  <tom@tromey.com>
> 
> 	* gdb.python/py-value.exp (test_value_creation): Make "long" test
> 	depend on Python 2.

LGTM.

Thanks,
Pedro Alves
  

Patch

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d8466f1..f5d61ff 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@ 
 2016-10-31  Tom Tromey  <tom@tromey.com>
 
+	* gdb.python/py-value.exp (test_value_creation): Make "long" test
+	depend on Python 2.
+
+2016-10-31  Tom Tromey  <tom@tromey.com>
+
 	* gdb.python/py-framefilter.py (ElidingFrameDecorator.address):
 	New method.
 
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index 89be659..39b0385 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -56,7 +56,11 @@  proc test_value_creation {} {
   }
 
   gdb_py_test_silent_cmd "python l = gdb.Value(0xffffffff12345678)" "create large unsigned 64-bit value" 1
-  gdb_test "python print long(l)" "18446744069720004216" "large unsigned 64-bit int conversion to python"
+  if { $gdb_py_is_py3k == 0 } {
+    gdb_test "python print long(l)" "18446744069720004216" "large unsigned 64-bit int conversion to python"
+  } else {
+    gdb_test "python print (int(l))" "18446744069720004216" "large unsigned 64-bit int conversion to python"
+  }
 
   gdb_py_test_silent_cmd "python f = gdb.Value (1.25)" "create double value" 1
   gdb_py_test_silent_cmd "python a = gdb.Value ('string test')" "create 8-bit string value" 1