From: Pedro Alves <pedro@palves.net>
Date: Thu, 17 Sep 2020 22:33:40 +0000 (+0100)
Subject: gdb.base/nested-addr.{c,exp} C++ify
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=52626c58267233b0e6a9807a80945467a019013b;p=binutils-gdb.git

gdb.base/nested-addr.{c,exp} C++ify

Adjust gdb.base/nested-addr.exp to let the testcase build and run as a
C++ program.  "print /d" is used so we get "= 1" instead of "= true"
in C++ mode.

gdb/testsuite/ChangeLog:

	* gdb.base/nested-addr.c (main): Add cast.
	* gdb.base/nested-addr.exp: Use "print /d".
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c7e2c4c59be..2dbaab74d0e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-09-17  Pedro Alves  <pedro@palves.net>
+
+	* gdb.base/nested-addr.c (main): Add cast.
+	* gdb.base/nested-addr.exp: Use "print /d".
+
 2020-09-17  Pedro Alves  <pedro@palves.net>
 
 	* gdb.base/break.exp (func): New.  Use it throughout when
diff --git a/gdb/testsuite/gdb.base/nested-addr.c b/gdb/testsuite/gdb.base/nested-addr.c
index 4725753382d..3d1cfd45376 100644
--- a/gdb/testsuite/gdb.base/nested-addr.c
+++ b/gdb/testsuite/gdb.base/nested-addr.c
@@ -28,7 +28,7 @@ static foo *foo_array = NULL;
 int
 main (void)
 {
-  foo_array = calloc (3, sizeof (*foo_array));
+  foo_array = (foo *) calloc (3, sizeof (*foo_array));
   foo_array[1].a = 10;
   foo_array[2].b = 20;
   return 0; /* BREAK */
diff --git a/gdb/testsuite/gdb.base/nested-addr.exp b/gdb/testsuite/gdb.base/nested-addr.exp
index 7ed0d65d327..15071cac9c7 100644
--- a/gdb/testsuite/gdb.base/nested-addr.exp
+++ b/gdb/testsuite/gdb.base/nested-addr.exp
@@ -31,4 +31,4 @@ gdb_test "print &foo_array\[1\].a" "= \\(int \\*\\) $hex.*"
 
 # A bug in EVAL_AVOID_SIDE_EFFECTS mode used to yield the following error:
 #    Attempt to take address of value not located in memory.
-gdb_test "print 1 && &foo_array\[1\].a" "= 1"
+gdb_test "print /d 1 && &foo_array\[1\].a" "= 1"