From: Simon Marchi <simon.marchi@ericsson.com>
To: gdb-patches@sourceware.org
Cc: simon.marchi@polymtl.ca, Simon Marchi <simon.marchi@ericsson.com>
Subject: [PATCH 3/3] Fix prints in tests for Python 3
Date: Wed, 26 Nov 2014 04:36:00 -0000 [thread overview]
Message-ID: <1416976561-1927-3-git-send-email-simon.marchi@ericsson.com> (raw)
In-Reply-To: <1416976561-1927-1-git-send-email-simon.marchi@ericsson.com>
Python 3's print requires to use parentheses, so this patch adds them where
they were missing.
gdb/testsuite/ChangeLog:
* gdb.python/py-linetable.exp: Add parentheses to calls to print.
* gdb.python/py-type.exp: Same.
* gdb.python/py-value-cc.exp: Same.
* gdb.python/py-value.exp: Same.
---
gdb/testsuite/gdb.python/py-linetable.exp | 14 +++++++-------
gdb/testsuite/gdb.python/py-type.exp | 6 +++---
gdb/testsuite/gdb.python/py-value-cc.exp | 24 ++++++++++++------------
gdb/testsuite/gdb.python/py-value.exp | 2 +-
4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/gdb/testsuite/gdb.python/py-linetable.exp b/gdb/testsuite/gdb.python/py-linetable.exp
index 682b5b7..351f380 100644
--- a/gdb/testsuite/gdb.python/py-linetable.exp
+++ b/gdb/testsuite/gdb.python/py-linetable.exp
@@ -44,17 +44,17 @@ gdb_py_test_multiple "input simple command" \
"python" "" \
"def list_lines():" "" \
" for l in lt:" "" \
- " print 'L' +str(l.line)+' A '+hex(l.pc)" "" \
+ " print ('L' + str(l.line) + ' A ' + hex(l.pc))" "" \
"end" ""
gdb_test "python list_lines()" \
"L20 A $hex.*L21 A $hex.*L22 A $hex.*L24 A $hex.*L25 A $hex.*L40 A $hex.*L42 A $hex.*L44 A $hex.*L42 A $hex.*L46 A $hex.*" \
"test linetable iterator addr"
-gdb_test "python print len(lt.line(42))" "2" \
+gdb_test "python print (len(lt.line(42)))" "2" \
"Test length of a multiple pc line"
-gdb_test "python print len(lt.line(20))" "1" \
+gdb_test "python print (len(lt.line(20)))" "1" \
"Test length of a single pc line"
-gdb_test "python print lt.line(1)" "None" \
+gdb_test "python print (lt.line(1))" "None" \
"Test None returned for line with no pc"
# Test gdb.Linetable.sourcelines ()
@@ -65,12 +65,12 @@ gdb_test "python print sorted(fset)" \
"Test frozen set contains line numbers"
# Test gdb.Linetable.has_line ()
-gdb_test "python print lt.has_line(20)" \
+gdb_test "python print (lt.has_line(20))" \
"True.*" \
"Test has_pcs at line 20"
-gdb_test "python print lt.has_line(44)" \
+gdb_test "python print (lt.has_line(44))" \
"True.*" \
"Test has_pcs at line 40"
-gdb_test "python print lt.has_line(10)" \
+gdb_test "python print (lt.has_line(10))" \
"False.*" \
"Test has_pcs at line 10"
diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index 6b61f48..921b0cd 100644
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -89,10 +89,10 @@ proc test_fields {lang} {
gdb_py_test_silent_cmd "python ss = gdb.parse_and_eval('ss')" "init ss" 1
gdb_py_test_silent_cmd "python ss_fields = ss.type.fields()" \
"get fields from ss.type" 1
- gdb_test "python print len(ss_fields)" "2" "Check length of ss_fields"
- gdb_test "python print ss_fields\[0\].name is None" "True" \
+ gdb_test "python print (len(ss_fields))" "2" "Check length of ss_fields"
+ gdb_test "python print (ss_fields\[0\].name is None)" "True" \
"Check ss_fields\[0\].name"
- gdb_test "python print ss_fields\[1\].name is None" "True" \
+ gdb_test "python print (ss_fields\[1\].name is None)" "True" \
"Check ss_fields\[1\].name"
# Regression test for
# http://sourceware.org/bugzilla/show_bug.cgi?id=12070.
diff --git a/gdb/testsuite/gdb.python/py-value-cc.exp b/gdb/testsuite/gdb.python/py-value-cc.exp
index 949f04f..a965f5d 100644
--- a/gdb/testsuite/gdb.python/py-value-cc.exp
+++ b/gdb/testsuite/gdb.python/py-value-cc.exp
@@ -88,18 +88,18 @@ gdb_test "python print(b_td\[b_fields\[0\]\]\['a'\])" "100" \
gdb_test "python print(u\[u_fields\[0\]\])" "99.*" "u's first field via field"
gdb_test "python print(u\[u_fields\[1\]\])" "99.*" "u's second field via field"
-gdb_test "python print len(x_fields)" "2" "number for fields in u"
-gdb_test "python print x\[x_fields\[0\]\]\['x'\]" "101" "x.x via field"
-gdb_test "python print x\[x_fields\[1\]\]\['a'\]" "102" "x.a via field"
-gdb_test "python print x_ptr\[x_fields\[0\]\]\['x'\]" "101" "x_ptr->x via field"
-gdb_test "python print x_ptr\[x_fields\[1\]\]\['a'\]" "102" "x_ptr->a via field"
-gdb_test "python print xtd\[x_fields\[0\]\]\['x'\]" "101" "xtd->x via field"
-gdb_test "python print xtd\[x_fields\[1\]\]\['a'\]" "102" "xtd->a via field"
-
-gdb_test "python print len(uu_fields)" "2" "number of fields in uu"
-gdb_test "python print uu\[uu_fields\[0\]\]\['x'\]" "1000" "uu.x via field"
-gdb_test "python print uu\[uu_fields\[1\]\]\['a'\]" "1000" "uu.a via field"
+gdb_test "python print (len(x_fields))" "2" "number for fields in u"
+gdb_test "python print (x\[x_fields\[0\]\]\['x'\])" "101" "x.x via field"
+gdb_test "python print (x\[x_fields\[1\]\]\['a'\])" "102" "x.a via field"
+gdb_test "python print (x_ptr\[x_fields\[0\]\]\['x'\])" "101" "x_ptr->x via field"
+gdb_test "python print (x_ptr\[x_fields\[1\]\]\['a'\])" "102" "x_ptr->a via field"
+gdb_test "python print (xtd\[x_fields\[0\]\]\['x'\])" "101" "xtd->x via field"
+gdb_test "python print (xtd\[x_fields\[1\]\]\['a'\])" "102" "xtd->a via field"
+
+gdb_test "python print (len(uu_fields))" "2" "number of fields in uu"
+gdb_test "python print (uu\[uu_fields\[0\]\]\['x'\])" "1000" "uu.x via field"
+gdb_test "python print (uu\[uu_fields\[1\]\]\['a'\])" "1000" "uu.a via field"
# Test overloaded operators.
gdb_test_no_output "python a = gdb.parse_and_eval('a')" "init a"
-gdb_test "python print a + 5" "10" "a + 5"
+gdb_test "python print (a + 5)" "10" "a + 5"
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index 0e1534a..76238a1 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -294,7 +294,7 @@ proc test_value_in_inferior {} {
# Test fetching a string longer than its declared (in C) size.
# PR 16286
gdb_py_test_silent_cmd "python xstr = gdb.parse_and_eval('xstr')" "get xstr" 1
- gdb_test "python print xstr\['text'\].string (length = xstr\['length'\])" "x{100}" \
+ gdb_test "python print (xstr\['text'\].string (length = xstr\['length'\]))" "x{100}" \
"read string beyond declared size"
}
--
2.1.3
next prev parent reply other threads:[~2014-11-26 4:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-26 4:36 [PATCH 1/3] python extended prompt: Use os.getcwd() instead of os.getcwdu() Simon Marchi
2014-11-26 4:36 ` Simon Marchi [this message]
2014-11-27 8:40 ` [PATCH 3/3] Fix prints in tests for Python 3 Joel Brobecker
2014-11-28 16:40 ` Simon Marchi
2014-11-26 4:36 ` [PATCH 2/3] Fix Python help() test " Simon Marchi
2014-11-27 8:47 ` Joel Brobecker
2014-11-28 15:57 ` Simon Marchi
2014-11-29 11:42 ` Joel Brobecker
2014-12-01 13:08 ` Simon Marchi
2014-11-27 9:00 ` [PATCH 1/3] python extended prompt: Use os.getcwd() instead of os.getcwdu() Joel Brobecker
2014-11-28 15:49 ` Simon Marchi
2014-11-29 11:42 ` Joel Brobecker
2014-12-05 20:36 ` Simon Marchi
2014-12-15 16:41 ` Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416976561-1927-3-git-send-email-simon.marchi@ericsson.com \
--to=simon.marchi@ericsson.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@polymtl.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).