From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1726) id D48C53858C52; Mon, 28 Nov 2022 21:04:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D48C53858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669669474; bh=ewnlSgoYeK5XfHvCG6gmIoBjoIWMglHgKpQ9olObKV4=; h=From:To:Subject:Date:From; b=Qyptk9XX1uGYT2C7y3xZDzg7LdeR9Ae9YITo3T5qkRTP181wXthMjBobIzMk8QTwG j8sQWVqN70sHon1+KmpgkHcft4o6/pfcJY40P6i8/ow851Bi8we8AhrsqzotoariJu aKuBSOvsvrpYilRERR+tJcGUzQMskFE1Wj7nbilw= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Andrew Burgess To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb/testsuite: remove DOS line endings from a test script X-Act-Checkin: binutils-gdb X-Git-Author: Andrew Burgess X-Git-Refname: refs/heads/master X-Git-Oldrev: 1dd889362bb7027ebea754a161bf629270cc9042 X-Git-Newrev: e2afece894f0de7990997792e3781cf925a011a0 Message-Id: <20221128210434.D48C53858C52@sourceware.org> Date: Mon, 28 Nov 2022 21:04:34 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3De2afece894f0= de7990997792e3781cf925a011a0 commit e2afece894f0de7990997792e3781cf925a011a0 Author: Andrew Burgess Date: Mon Nov 14 14:25:47 2022 +0000 gdb/testsuite: remove DOS line endings from a test script =20 The gdb.fortran/nested-funcs.exp test script has DOS line endings. I can see no reason why this script needs DOS line endings. =20 Convert to UNIX line endings. =20 There should be no change in what is tested after this commit. Diff: --- gdb/testsuite/gdb.fortran/nested-funcs.exp | 184 ++++++++++++++-----------= ---- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/gdb/testsuite/gdb.fortran/nested-funcs.exp b/gdb/testsuite/gdb= .fortran/nested-funcs.exp index d5ba7ce3c5e..ea3d66685be 100755 --- a/gdb/testsuite/gdb.fortran/nested-funcs.exp +++ b/gdb/testsuite/gdb.fortran/nested-funcs.exp @@ -1,92 +1,92 @@ -# Copyright 2016-2022 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# This testcase is supposed to test DWARF static link which is usually -# used together with nested functions. =20 - -if { [skip_fortran_tests] } { return -1 } - -standard_testfile .f90 -load_lib "fortran.exp" - -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90= }]} { - return -1 -} - -if ![fortran_runto_main] then { - perror "couldn't run to main" - continue -} - -# Test if we can set a breakpoint in a nested function -gdb_breakpoint "testnestedfuncs::sub_nested_outer" -gdb_continue_to_breakpoint "testnestedfuncs::sub_nested_outer" \ - ".*local_int =3D 19" - -# Test if we can access local and -# non-local variables defined one level up. -gdb_breakpoint [gdb_get_line_number "! BP_outer"] -gdb_continue_to_breakpoint "! BP_outer" ".*! BP_outer" -gdb_test "print index" "=3D 13" "print index at BP_outer" -gdb_test_no_output "set variable index =3D 42" -gdb_test "print index" "=3D 42" "print index at BP_outer, manipulated" -gdb_test "print local_int" "=3D 19" "print local_int in outer function" - -# Non-local variable should be affected in one frame up as well. -gdb_test "up" -gdb_test "print index" "=3D 42" "print index at BP1, one frame up" - -# Test if we can set a breakpoint in a nested function -gdb_breakpoint "testnestedfuncs::sub_nested_inner" -gdb_continue_to_breakpoint "testnestedfuncs::sub_nested_inner" \ - ".*local_int =3D 17" - -# Test if we can access local and -# non-local variables defined two level up. -gdb_breakpoint [gdb_get_line_number "! BP_inner"] -gdb_continue_to_breakpoint "! BP_inner" ".*! BP_inner" -gdb_test "print index" "=3D 42" "print index at BP_inner" -gdb_test "print v_state%code" "=3D 61" "print v_state%code at BP_inner" -gdb_test "print local_int" "=3D 17" "print local_int in inner function" - -# Test if local variable is still correct. -gdb_breakpoint [gdb_get_line_number "! BP_outer_2"] -gdb_continue_to_breakpoint "! BP_outer_2" ".*! BP_outer_2" -gdb_test "print local_int" "=3D 19" \ - "print local_int in outer function, after sub_nested_inner" - -# Test if we can set a breakpoint in public routine with the same name -# as the internal -gdb_breakpoint "sub_nested_outer" -gdb_continue_to_breakpoint "sub_nested_outer" \ - ".*name =3D 'sub_nested_outer external'" - -# Test if we can set a breakpoint in public routine with the same name -# as the internal -gdb_breakpoint "sub_with_sub_nested_outer::sub_nested_outer" -gdb_continue_to_breakpoint \ - "sub_with_sub_nested_outer::sub_nested_outer" ".*local_int =3D 11" - -# Test if we can set a breakpoint in public routine with the same name -# as the internal -gdb_breakpoint "mod1::sub_nested_outer" -gdb_continue_to_breakpoint "mod1::sub_nested_outer" \ - ".*name =3D 'sub_nested_outer_mod1'" - -# Sanity check in main. -gdb_breakpoint [gdb_get_line_number "! BP_main"] -gdb_continue_to_breakpoint "! BP_main" ".*! BP_main" -gdb_test "print index" "=3D 42" "print index at BP_main" -gdb_test "print v_state%code" "=3D 59" "print v_state%code at BP_main" +# Copyright 2016-2022 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This testcase is supposed to test DWARF static link which is usually +# used together with nested functions. =20 + +if { [skip_fortran_tests] } { return -1 } + +standard_testfile .f90 +load_lib "fortran.exp" + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90= }]} { + return -1 +} + +if ![fortran_runto_main] then { + perror "couldn't run to main" + continue +} + +# Test if we can set a breakpoint in a nested function +gdb_breakpoint "testnestedfuncs::sub_nested_outer" +gdb_continue_to_breakpoint "testnestedfuncs::sub_nested_outer" \ + ".*local_int =3D 19" + +# Test if we can access local and +# non-local variables defined one level up. +gdb_breakpoint [gdb_get_line_number "! BP_outer"] +gdb_continue_to_breakpoint "! BP_outer" ".*! BP_outer" +gdb_test "print index" "=3D 13" "print index at BP_outer" +gdb_test_no_output "set variable index =3D 42" +gdb_test "print index" "=3D 42" "print index at BP_outer, manipulated" +gdb_test "print local_int" "=3D 19" "print local_int in outer function" + +# Non-local variable should be affected in one frame up as well. +gdb_test "up" +gdb_test "print index" "=3D 42" "print index at BP1, one frame up" + +# Test if we can set a breakpoint in a nested function +gdb_breakpoint "testnestedfuncs::sub_nested_inner" +gdb_continue_to_breakpoint "testnestedfuncs::sub_nested_inner" \ + ".*local_int =3D 17" + +# Test if we can access local and +# non-local variables defined two level up. +gdb_breakpoint [gdb_get_line_number "! BP_inner"] +gdb_continue_to_breakpoint "! BP_inner" ".*! BP_inner" +gdb_test "print index" "=3D 42" "print index at BP_inner" +gdb_test "print v_state%code" "=3D 61" "print v_state%code at BP_inner" +gdb_test "print local_int" "=3D 17" "print local_int in inner function" + +# Test if local variable is still correct. +gdb_breakpoint [gdb_get_line_number "! BP_outer_2"] +gdb_continue_to_breakpoint "! BP_outer_2" ".*! BP_outer_2" +gdb_test "print local_int" "=3D 19" \ + "print local_int in outer function, after sub_nested_inner" + +# Test if we can set a breakpoint in public routine with the same name +# as the internal +gdb_breakpoint "sub_nested_outer" +gdb_continue_to_breakpoint "sub_nested_outer" \ + ".*name =3D 'sub_nested_outer external'" + +# Test if we can set a breakpoint in public routine with the same name +# as the internal +gdb_breakpoint "sub_with_sub_nested_outer::sub_nested_outer" +gdb_continue_to_breakpoint \ + "sub_with_sub_nested_outer::sub_nested_outer" ".*local_int =3D 11" + +# Test if we can set a breakpoint in public routine with the same name +# as the internal +gdb_breakpoint "mod1::sub_nested_outer" +gdb_continue_to_breakpoint "mod1::sub_nested_outer" \ + ".*name =3D 'sub_nested_outer_mod1'" + +# Sanity check in main. +gdb_breakpoint [gdb_get_line_number "! BP_main"] +gdb_continue_to_breakpoint "! BP_main" ".*! BP_main" +gdb_test "print index" "=3D 42" "print index at BP_main" +gdb_test "print v_state%code" "=3D 59" "print v_state%code at BP_main"