From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1726) id 98EB53855151; Mon, 28 Nov 2022 21:05:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 98EB53855151 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669669525; bh=i7ze4L1PLGnvoKQvne7UWjrop2VVkOuwDZlm1RSVpKQ=; h=From:To:Subject:Date:From; b=rMeogeexIvd/dt4waWZGijJTBm3qn0/Fak+w/rkmoX0EobVZyiVN8AZCDZziMEpgP u4AoaY5l4FbellQ2nGhKnmRddNXu1YSBt2ApvNq6Ehs1PBJYnp06my8v9jY9SVV2vC PmZ4T9BT2hOJ+BeSwR5AgW5o5BpWA9lfj6/88llE= 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 use of then keyword from gdb.fortran/*.exp X-Act-Checkin: binutils-gdb X-Git-Author: Andrew Burgess X-Git-Refname: refs/heads/master X-Git-Oldrev: 6ca2ea063a71d6e2742096f980c2607e9d413cf5 X-Git-Newrev: 49bb47443c05e573d1675adba6d8f07562db2d3f Message-Id: <20221128210525.98EB53855151@sourceware.org> Date: Mon, 28 Nov 2022 21:05:25 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D49bb47443c05= e573d1675adba6d8f07562db2d3f commit 49bb47443c05e573d1675adba6d8f07562db2d3f Author: Andrew Burgess Date: Mon Nov 14 14:24:37 2022 +0000 gdb/testsuite: remove use of then keyword from gdb.fortran/*.exp =20 The canonical form of 'if' in modern TCL is 'if {} {}'. But there's still a bunch of places in the testsuite where we make use of the 'then' keyword, and sometimes these get copies into new tests, which just spreads poor practice. =20 This commit removes all use of the 'then' keyword from the gdb.fortran/ test script directory. =20 There should be no changes in what is tested after this commit. Diff: --- gdb/testsuite/gdb.fortran/array-element.exp | 2 +- gdb/testsuite/gdb.fortran/block-data.exp | 2 +- gdb/testsuite/gdb.fortran/common-block.exp | 2 +- gdb/testsuite/gdb.fortran/complex.exp | 2 +- gdb/testsuite/gdb.fortran/derived-type-function.exp | 2 +- gdb/testsuite/gdb.fortran/derived-type-striding.exp | 2 +- gdb/testsuite/gdb.fortran/derived-type.exp | 2 +- gdb/testsuite/gdb.fortran/dot-ops.exp | 2 +- gdb/testsuite/gdb.fortran/exprs.exp | 2 +- gdb/testsuite/gdb.fortran/function-calls.exp | 2 +- gdb/testsuite/gdb.fortran/library-module.exp | 2 +- gdb/testsuite/gdb.fortran/module.exp | 2 +- gdb/testsuite/gdb.fortran/namelist.exp | 2 +- gdb/testsuite/gdb.fortran/nested-funcs-2.exp | 2 +- gdb/testsuite/gdb.fortran/nested-funcs.exp | 2 +- gdb/testsuite/gdb.fortran/printing-types.exp | 2 +- gdb/testsuite/gdb.fortran/ptr-indentation.exp | 2 +- gdb/testsuite/gdb.fortran/ptype-on-functions.exp | 2 +- gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp | 2 +- gdb/testsuite/gdb.fortran/subarray.exp | 2 +- gdb/testsuite/gdb.fortran/type-kinds.exp | 2 +- gdb/testsuite/gdb.fortran/types.exp | 2 +- gdb/testsuite/gdb.fortran/vla-value.exp | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gdb/testsuite/gdb.fortran/array-element.exp b/gdb/testsuite/gd= b.fortran/array-element.exp index 22b72e2974b..f5d313cdf1a 100644 --- a/gdb/testsuite/gdb.fortran/array-element.exp +++ b/gdb/testsuite/gdb.fortran/array-element.exp @@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $s= rcfile {debug f90}]} { return -1 } =20 -if ![runto sub_] then { +if {![runto sub_]} { perror "couldn't run to breakpoint sub_" return } diff --git a/gdb/testsuite/gdb.fortran/block-data.exp b/gdb/testsuite/gdb.f= ortran/block-data.exp index 482dcc296b2..ab064910108 100644 --- a/gdb/testsuite/gdb.fortran/block-data.exp +++ b/gdb/testsuite/gdb.fortran/block-data.exp @@ -30,7 +30,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile= {debug f90}]} { return -1 } =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { return -1 } =20 diff --git a/gdb/testsuite/gdb.fortran/common-block.exp b/gdb/testsuite/gdb= .fortran/common-block.exp index e8d7c222134..b8cbfb895c5 100644 --- a/gdb/testsuite/gdb.fortran/common-block.exp +++ b/gdb/testsuite/gdb.fortran/common-block.exp @@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" ${testfile} \ return -1 } =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { perror "couldn't run to main" return } diff --git a/gdb/testsuite/gdb.fortran/complex.exp b/gdb/testsuite/gdb.fort= ran/complex.exp index 9298b3be56c..896e01cb932 100644 --- a/gdb/testsuite/gdb.fortran/complex.exp +++ b/gdb/testsuite/gdb.fortran/complex.exp @@ -22,7 +22,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $s= rcfile {debug f90 quiet return -1 } =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { perror "Couldn't run to main" return } diff --git a/gdb/testsuite/gdb.fortran/derived-type-function.exp b/gdb/test= suite/gdb.fortran/derived-type-function.exp index 573444a5808..3adabd63d36 100644 --- a/gdb/testsuite/gdb.fortran/derived-type-function.exp +++ b/gdb/testsuite/gdb.fortran/derived-type-function.exp @@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $s= rcfile {debug f90}]} { return -1 } =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { perror "couldn't run to main" return } diff --git a/gdb/testsuite/gdb.fortran/derived-type-striding.exp b/gdb/test= suite/gdb.fortran/derived-type-striding.exp index 1edc489bcfb..bf868f57284 100644 --- a/gdb/testsuite/gdb.fortran/derived-type-striding.exp +++ b/gdb/testsuite/gdb.fortran/derived-type-striding.exp @@ -29,7 +29,7 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${sr= cfile} \ return -1 } =20 -if {![runto [gdb_get_line_number "post_init"]]} then { +if {![runto [gdb_get_line_number "post_init"]]} { perror "couldn't run to breakpoint post_init" return } diff --git a/gdb/testsuite/gdb.fortran/derived-type.exp b/gdb/testsuite/gdb= .fortran/derived-type.exp index b3be8e57056..63ec0c8d0ba 100644 --- a/gdb/testsuite/gdb.fortran/derived-type.exp +++ b/gdb/testsuite/gdb.fortran/derived-type.exp @@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $s= rcfile {debug f90}]} { return -1 } =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { perror "couldn't run to main" return } diff --git a/gdb/testsuite/gdb.fortran/dot-ops.exp b/gdb/testsuite/gdb.fort= ran/dot-ops.exp index fefa27b87db..2bad2bc7c8f 100644 --- a/gdb/testsuite/gdb.fortran/dot-ops.exp +++ b/gdb/testsuite/gdb.fortran/dot-ops.exp @@ -153,7 +153,7 @@ proc test_dot_operations {} { =20 clean_restart =20 -if [set_lang_fortran] then { +if {[set_lang_fortran]} { test_dot_operations } else { warning "$test_name tests suppressed." 0 diff --git a/gdb/testsuite/gdb.fortran/exprs.exp b/gdb/testsuite/gdb.fortra= n/exprs.exp index 28c0a86f239..c14cdad4ff5 100644 --- a/gdb/testsuite/gdb.fortran/exprs.exp +++ b/gdb/testsuite/gdb.fortran/exprs.exp @@ -249,7 +249,7 @@ gdb_reinitialize_dir $srcdir/$subdir =20 gdb_test "set print sevenbit-strings" "" =20 -if [set_lang_fortran] then { +if {[set_lang_fortran]} { test_value_history test_convenience_variables test_integer_literals_accepted diff --git a/gdb/testsuite/gdb.fortran/function-calls.exp b/gdb/testsuite/g= db.fortran/function-calls.exp index bc0192be064..ea58e6249c9 100644 --- a/gdb/testsuite/gdb.fortran/function-calls.exp +++ b/gdb/testsuite/gdb.fortran/function-calls.exp @@ -39,7 +39,7 @@ with_complaints 5 { } } =20 -if {![runto [gdb_get_line_number "post_init"]]} then { +if {![runto [gdb_get_line_number "post_init"]]} { perror "couldn't run to breakpoint post_init" return } diff --git a/gdb/testsuite/gdb.fortran/library-module.exp b/gdb/testsuite/g= db.fortran/library-module.exp index 1745360d80c..a6ed67d404f 100644 --- a/gdb/testsuite/gdb.fortran/library-module.exp +++ b/gdb/testsuite/gdb.fortran/library-module.exp @@ -39,7 +39,7 @@ clean_restart $testfile =20 gdb_load_shlib $libfile =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { perror "couldn't run to main" return } diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortr= an/module.exp index fe539fbc6d3..b9c9d6b44f3 100644 --- a/gdb/testsuite/gdb.fortran/module.exp +++ b/gdb/testsuite/gdb.fortran/module.exp @@ -34,7 +34,7 @@ gdb_test "print mod1::var_const" " =3D 20" "fully qualifi= ed name of DW_TAG_constan # Avoid shared lib symbols. gdb_test_no_output "set auto-solib-add off" =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { perror "couldn't run to main" return } diff --git a/gdb/testsuite/gdb.fortran/namelist.exp b/gdb/testsuite/gdb.for= tran/namelist.exp index 39cf0e17654..46f24f47970 100644 --- a/gdb/testsuite/gdb.fortran/namelist.exp +++ b/gdb/testsuite/gdb.fortran/namelist.exp @@ -25,7 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $s= rcfile {debug f90}]} { return -1 } =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { perror "couldn't run to main" return } diff --git a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp b/gdb/testsuite/g= db.fortran/nested-funcs-2.exp index bf679447c03..2a83144b648 100644 --- a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp +++ b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp @@ -108,7 +108,7 @@ proc do_bp_tests {with_src_prefix_p with_nest_prefix_p}= { } =20 # Break on a contained function and run to it. - if {![runto ${src_prefix}[gdb_get_line_number "pre_init"]]} then { + if {![runto ${src_prefix}[gdb_get_line_number "pre_init"]]} { perror "couldn't run to breakpoint pre_init" return } diff --git a/gdb/testsuite/gdb.fortran/nested-funcs.exp b/gdb/testsuite/gdb= .fortran/nested-funcs.exp index ea3d66685be..237e09ed009 100755 --- a/gdb/testsuite/gdb.fortran/nested-funcs.exp +++ b/gdb/testsuite/gdb.fortran/nested-funcs.exp @@ -25,7 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $s= rcfile {debug f90}]} { return -1 } =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { perror "couldn't run to main" continue } diff --git a/gdb/testsuite/gdb.fortran/printing-types.exp b/gdb/testsuite/g= db.fortran/printing-types.exp index 3a8e02fea12..0ba07f6c1ff 100644 --- a/gdb/testsuite/gdb.fortran/printing-types.exp +++ b/gdb/testsuite/gdb.fortran/printing-types.exp @@ -22,7 +22,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile= {debug f90}]} { return -1 } =20 -if {![fortran_runto_main]} then { +if {![fortran_runto_main]} { return -1 } =20 diff --git a/gdb/testsuite/gdb.fortran/ptr-indentation.exp b/gdb/testsuite/= gdb.fortran/ptr-indentation.exp index 98378342957..daf5bd53550 100644 --- a/gdb/testsuite/gdb.fortran/ptr-indentation.exp +++ b/gdb/testsuite/gdb.fortran/ptr-indentation.exp @@ -22,7 +22,7 @@ if {[prepare_for_testing $testfile.exp $testfile $srcfile= {debug f90}]} { return -1 } =20 -if {![fortran_runto_main]} then { +if {![fortran_runto_main]} { return -1 } =20 diff --git a/gdb/testsuite/gdb.fortran/ptype-on-functions.exp b/gdb/testsui= te/gdb.fortran/ptype-on-functions.exp index cc2454858a0..6751b50a43d 100644 --- a/gdb/testsuite/gdb.fortran/ptype-on-functions.exp +++ b/gdb/testsuite/gdb.fortran/ptype-on-functions.exp @@ -24,7 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $s= rcfile {debug f90}]} { return -1 } =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { perror "couldn't run to main" return } diff --git a/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp b/gd= b/testsuite/gdb.fortran/short-circuit-argument-list.exp index aa7f5d1ebde..d458e1adfc4 100644 --- a/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp +++ b/gdb/testsuite/gdb.fortran/short-circuit-argument-list.exp @@ -25,7 +25,7 @@ if {[prepare_for_testing ${testfile}.exp ${testfile} ${sr= cfile} {debug f90}]} { return -1 } =20 -if {![runto [gdb_get_line_number "post_truth_table_init"]]} then { +if {![runto [gdb_get_line_number "post_truth_table_init"]]} { perror "couldn't run to breakpoint post_truth_table_init" return } diff --git a/gdb/testsuite/gdb.fortran/subarray.exp b/gdb/testsuite/gdb.for= tran/subarray.exp index b282c5dd7c9..88d47f91e77 100644 --- a/gdb/testsuite/gdb.fortran/subarray.exp +++ b/gdb/testsuite/gdb.fortran/subarray.exp @@ -30,7 +30,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $s= rcfile {debug f90}]} { # Avoid shared lib symbols. gdb_test_no_output "set auto-solib-add off" =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { perror "couldn't run to main" return } diff --git a/gdb/testsuite/gdb.fortran/type-kinds.exp b/gdb/testsuite/gdb.f= ortran/type-kinds.exp index 47b788bf134..e481ad3b38d 100644 --- a/gdb/testsuite/gdb.fortran/type-kinds.exp +++ b/gdb/testsuite/gdb.fortran/type-kinds.exp @@ -101,7 +101,7 @@ proc test_old_star_type_sizes {} { =20 clean_restart =20 -if [set_lang_fortran] then { +if {[set_lang_fortran]} { test_basic_parsing_of_type_kinds test_parsing_invalid_type_kinds test_old_star_type_sizes diff --git a/gdb/testsuite/gdb.fortran/types.exp b/gdb/testsuite/gdb.fortra= n/types.exp index 594276f3a7b..eac667646ac 100644 --- a/gdb/testsuite/gdb.fortran/types.exp +++ b/gdb/testsuite/gdb.fortran/types.exp @@ -106,7 +106,7 @@ gdb_reinitialize_dir $srcdir/$subdir =20 gdb_test "set print sevenbit-strings" "" =20 -if [set_lang_fortran] then { +if {[set_lang_fortran]} { test_primitive_types_known test_default_types test_integer_literal_types_accepted diff --git a/gdb/testsuite/gdb.fortran/vla-value.exp b/gdb/testsuite/gdb.fo= rtran/vla-value.exp index 5b3a680c9f7..36ba0b405e3 100644 --- a/gdb/testsuite/gdb.fortran/vla-value.exp +++ b/gdb/testsuite/gdb.fortran/vla-value.exp @@ -130,7 +130,7 @@ gdb_test "print vla1(9, 9, 9)" "no such vector element = \\\(vector not allocated\ # Try to assign VLA to user variable clean_restart ${testfile} =20 -if ![fortran_runto_main] then { +if {![fortran_runto_main]} { perror "couldn't run to main" return }