Patchwork [gdb/testsuite] Fix wrong return type in tests

login
register
mail settings
Submitter Thomas Preud'homme
Date Nov. 29, 2017, 1:42 p.m.
Message ID <55f5e146-deff-f1f7-cb14-10a180121907@foss.arm.com>
Download mbox | patch
Permalink /patch/24597/
State New
Headers show

Comments

Thomas Preud'homme - Nov. 29, 2017, 1:42 p.m.
Done (see attached patch).

*** gdb/testsuite/ChangeLog ***

2017-11-29  Thomas Preud'homme  <thomas.preudhomme@arm.com>

	* gdb.cp/psymtab-parameter.cc (func): Change return type back to long.
	Return 0 as a long.
	* gdb.cp/psymtab-parameter.exp: Change func's return type back to long.

Testing: Testcase still PASSes with the change.

Best regards,

Thomas

On 29/11/17 12:06, Pedro Alves wrote:
> On 11/29/2017 11:59 AM, Thomas Preudhomme wrote:
>> My apologize, I thought it couldn't be significant since it was not
>> returning anything.  I didn't think about the impact on the prototype
>> itself.
> 
> No worries.  It was easy to miss.
> 
> How about making it return 0 instead then?
> 
> Yes please, go ahead and push such a fix in.
> 
> Thanks,
> Pedro Alves
>

Patch

diff --git a/gdb/testsuite/gdb.cp/psymtab-parameter.cc b/gdb/testsuite/gdb.cp/psymtab-parameter.cc
index 9f63fefcaeb800f7444fe74225514d3330036e5b..63038f03237b64ce4bff88e42fee7f836eca3249 100644
--- a/gdb/testsuite/gdb.cp/psymtab-parameter.cc
+++ b/gdb/testsuite/gdb.cp/psymtab-parameter.cc
@@ -16,9 +16,10 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 template <typename T>
-void
+long
 func ()
 {
+  return 0L;
 }
 
 void
diff --git a/gdb/testsuite/gdb.cp/psymtab-parameter.exp b/gdb/testsuite/gdb.cp/psymtab-parameter.exp
index 5c4b6ac71927fe9030bd9ce66111761425ab433b..3d78de91f4b3752d754bd776ae3532700a308a40 100644
--- a/gdb/testsuite/gdb.cp/psymtab-parameter.exp
+++ b/gdb/testsuite/gdb.cp/psymtab-parameter.exp
@@ -31,6 +31,6 @@  gdb_test_no_output "set language c++"
 # XFAIL than FAIL here.  For example -readnow breaks it.
 gdb_test_no_output "maintenance info symtabs"
 
-# GDB has shown only the `void func<short>()' ELF symbol before, not the DWARF
+# GDB has shown only the `long func<short>()' ELF symbol before, not the DWARF
 # symbol
 gdb_test "complete p 'func<short>(" "p 'func<short>\\(\\)"