From patchwork Tue Nov 15 10:42:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 60635 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 65AE5389942B for ; Tue, 15 Nov 2022 10:44:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 65AE5389942B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668509080; bh=H7YJgmCRaml+HQaJyfoNs7mHGuJZBZ1Xrp32oujy4ps=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=HoEFldKY8UPBUGqTG6r+vWFPPFlf5+JAz0FQfA1/AmTTgUVJ2Tfi1oHJZYLI4qiym UWWrSDp4rLV68G7GFCv9Pi7B6lgzavG+Z45svH1DzGSX/0csUvjHZSHtbSPUaDAtMS T2lrhzCF9WOfGWNzyCZndYFVoDo7YeQMgJ/Rq3tk= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 081003894C17 for ; Tue, 15 Nov 2022 10:42:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 081003894C17 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-552-lYKxG3QnN4uy275TPxcSBw-1; Tue, 15 Nov 2022 05:42:56 -0500 X-MC-Unique: lYKxG3QnN4uy275TPxcSBw-1 Received: by mail-qv1-f71.google.com with SMTP id mi12-20020a056214558c00b004bb63393567so10441636qvb.21 for ; Tue, 15 Nov 2022 02:42:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H7YJgmCRaml+HQaJyfoNs7mHGuJZBZ1Xrp32oujy4ps=; b=rnYKi7ExjQpBJDVSpnfDpY9OQRbb9SuA3QLM4otIil+zGhPfte2JJwJH/FSIJjjgl8 wySH7JhiHZW4NM8QmMgHCWCmqS3k3LJ+FB6XXIFGf59LIGKZqLJtTlB9eimijDBzypk/ tb9qeWMuMFGVD/ECDAL22ik+AKL782WYWY7ghqh3onjWZJ9aJA893K2K71EzbZhqI/B2 asa0NN0R1YayzoDwbna5+0MuGbzgJHd77mbj1dOO/djKejqp8/3hHsjEGAp0L4JAB3/T PjbA25vy+n7lqVnOtY7hfuLzsRw2Db9tdDurfm7UTzgKdjc7YHputAo9B5x8eB6m6XI0 +Kvw== X-Gm-Message-State: ANoB5pkgeC2qIReFPX9qwLJycWb8lmgj6fmtcLPnphs1R+aJ7zANuzEd dGA7N0nZjU/7tT2vXpZWe6f6329OF5z4DNfqgNCCOav3UjpYQqAMWC5cFFrBE8ms+gFSoIsIaxp 7DQ1dnnejKYTKf5NZ26jECTH9fPtWL/bcOC/YnVasxAg8+3PSGAL9jcpKQnx+WaqiCOfoCTIiBA == X-Received: by 2002:ac8:5c49:0:b0:3a5:68b6:88f2 with SMTP id j9-20020ac85c49000000b003a568b688f2mr15979993qtj.471.1668508975938; Tue, 15 Nov 2022 02:42:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf5jzldnpcMtWkSe2LA36Xn4Voy0q//xT96HiWISUuY5dmDvDlxkN5O2R0IBq826N47r6BV/Vg== X-Received: by 2002:ac8:5c49:0:b0:3a5:68b6:88f2 with SMTP id j9-20020ac85c49000000b003a568b688f2mr15979978qtj.471.1668508975507; Tue, 15 Nov 2022 02:42:55 -0800 (PST) Received: from localhost ([31.111.84.238]) by smtp.gmail.com with ESMTPSA id c8-20020ac853c8000000b00359961365f1sm6912855qtq.68.2022.11.15.02.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 02:42:55 -0800 (PST) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCH 09/14] gdb/testsuite: remove use of then keyword from gdb.reverse/*.exp Date: Tue, 15 Nov 2022 10:42:26 +0000 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" 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. This commit removes all use of the 'then' keyword from the gdb.reverse/ test script directory. There should be no changes in what is tested after this commit. --- gdb/testsuite/gdb.reverse/consecutive-precsave.exp | 6 +++--- gdb/testsuite/gdb.reverse/consecutive-reverse.exp | 6 +++--- gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp | 2 +- gdb/testsuite/gdb.reverse/i386-precsave.exp | 2 +- gdb/testsuite/gdb.reverse/i386-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/i386-sse-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/i387-env-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/i387-stack-reverse.exp | 2 +- gdb/testsuite/gdb.reverse/insn-reverse.exp | 2 +- .../gdb.reverse/next-reverse-bkpt-over-sr.exp | 2 +- gdb/testsuite/gdb.reverse/ppc_record_test_isa_2_06.exp | 6 +++--- gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp | 6 +++--- gdb/testsuite/gdb.reverse/sigall-precsave.exp | 10 +++++----- gdb/testsuite/gdb.reverse/sigall-reverse.exp | 10 +++++----- gdb/testsuite/gdb.reverse/test_ioctl_TCSETSW.exp | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp index 5d2c8105a1f..d1d1aa2b061 100644 --- a/gdb/testsuite/gdb.reverse/consecutive-precsave.exp +++ b/gdb/testsuite/gdb.reverse/consecutive-precsave.exp @@ -83,7 +83,7 @@ set testmsg "stopped at bp, 2nd instr" gdb_test_multiple "step" $testmsg { -re -wrap "Breakpoint $decimal, ($hex) in foo.*" { set stop_addr $expect_out(1,string) - if [eval expr "$foo2_addr == $stop_addr"] then { + if {[eval expr "$foo2_addr == $stop_addr"]} { pass "stopped at bp, 2nd instr" } else { fail "stopped at bp, 2nd instr (wrong address)" @@ -94,7 +94,7 @@ gdb_test_multiple "step" $testmsg { set stop_addr_is_stmt [hex_in_list $stop_addr $is_stmt] if { ! $stop_addr_is_stmt } { fail "stopped at bp, 2nd instr (missing hex prefix)" - } elseif [eval expr "$foo2_addr == $stop_addr"] then { + } elseif {[eval expr "$foo2_addr == $stop_addr"]} { pass "stopped at bp, 2nd instr" } else { fail "stopped at bp, 2nd instr (wrong address)" @@ -116,7 +116,7 @@ set test_msg "stopped at bp in reverse, 1st instr" gdb_test_multiple "step" "$test_msg" { -re "Breakpoint $decimal, ($hex) in foo.*$gdb_prompt $" { set stop_addr $expect_out(1,string) - if [eval expr "$foo1_addr == $stop_addr"] then { + if {[eval expr "$foo1_addr == $stop_addr"]} { pass "$test_msg" } else { fail "$test_msg (wrong address)" diff --git a/gdb/testsuite/gdb.reverse/consecutive-reverse.exp b/gdb/testsuite/gdb.reverse/consecutive-reverse.exp index 955cb4903e0..99d83328feb 100644 --- a/gdb/testsuite/gdb.reverse/consecutive-reverse.exp +++ b/gdb/testsuite/gdb.reverse/consecutive-reverse.exp @@ -63,7 +63,7 @@ set testmsg "stopped at bp, 2nd instr" gdb_test_multiple "step" $testmsg { -re -wrap "Breakpoint $decimal, ($hex) in foo.*" { set stop_addr $expect_out(1,string) - if [eval expr "$foo2_addr == $stop_addr"] then { + if {[eval expr "$foo2_addr == $stop_addr"]} { pass "stopped at bp, 2nd instr" } else { fail "stopped at bp, 2nd instr (wrong address)" @@ -74,7 +74,7 @@ gdb_test_multiple "step" $testmsg { set stop_addr_is_stmt [hex_in_list $stop_addr $is_stmt] if { ! $stop_addr_is_stmt } { fail "stopped at bp, 2nd instr (missing hex prefix)" - } elseif [eval expr "$foo2_addr == $stop_addr"] then { + } elseif {[eval expr "$foo2_addr == $stop_addr"]} { pass "stopped at bp, 2nd instr" } else { fail "stopped at bp, 2nd instr (wrong address)" @@ -96,7 +96,7 @@ set test_msg "stopped at bp in reverse, 1st instr" gdb_test_multiple "step" "$test_msg" { -re "Breakpoint $decimal, ($hex) in foo.*$gdb_prompt $" { set stop_addr $expect_out(1,string) - if [eval expr "$foo1_addr == $stop_addr"] then { + if {[eval expr "$foo1_addr == $stop_addr"]} { pass "$test_msg" } else { fail "$test_msg (wrong address)" diff --git a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp index 2a204748d98..5bfe14788c6 100644 --- a/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp +++ b/gdb/testsuite/gdb.reverse/finish-reverse-bkpt.exp @@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" "$testfile" $srcfile] } { return -1 } -if ![runto_main] then { +if {![runto_main]} { return 0 } diff --git a/gdb/testsuite/gdb.reverse/i386-precsave.exp b/gdb/testsuite/gdb.reverse/i386-precsave.exp index 54580474430..fbf80b89c05 100644 --- a/gdb/testsuite/gdb.reverse/i386-precsave.exp +++ b/gdb/testsuite/gdb.reverse/i386-precsave.exp @@ -25,7 +25,7 @@ if ![supports_process_record] { } -if ![is_x86_like_target] then { +if {![is_x86_like_target]} { verbose "Skipping i386 reverse tests." return } diff --git a/gdb/testsuite/gdb.reverse/i386-reverse.exp b/gdb/testsuite/gdb.reverse/i386-reverse.exp index 15c18dad205..6f6458c776e 100644 --- a/gdb/testsuite/gdb.reverse/i386-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i386-reverse.exp @@ -24,7 +24,7 @@ if ![supports_reverse] { } -if ![is_x86_like_target] then { +if {![is_x86_like_target]} { verbose "Skipping i386 reverse tests." return } diff --git a/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp b/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp index 9713e896f59..ac56cd4e50d 100644 --- a/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i386-sse-reverse.exp @@ -24,7 +24,7 @@ if ![supports_reverse] { } -if ![istarget "*86*-*linux*"] then { +if {![istarget "*86*-*linux*"]} { verbose "Skipping i386 reverse tests." return } diff --git a/gdb/testsuite/gdb.reverse/i387-env-reverse.exp b/gdb/testsuite/gdb.reverse/i387-env-reverse.exp index 53fee0986df..efc7c847d59 100644 --- a/gdb/testsuite/gdb.reverse/i387-env-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i387-env-reverse.exp @@ -16,7 +16,7 @@ # This file is part of the gdb testsuite. -if ![is_x86_like_target] then { +if {![is_x86_like_target]} { verbose "Skipping i387 reverse float tests." return } diff --git a/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp b/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp index cadd4f76035..f88c1dc0b86 100644 --- a/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp +++ b/gdb/testsuite/gdb.reverse/i387-stack-reverse.exp @@ -16,7 +16,7 @@ # This file is part of the gdb testsuite. -if ![is_x86_like_target] then { +if {![is_x86_like_target]} { verbose "Skipping i387 reverse float tests." return } diff --git a/gdb/testsuite/gdb.reverse/insn-reverse.exp b/gdb/testsuite/gdb.reverse/insn-reverse.exp index c5437ecef6f..82ae39f9cd9 100644 --- a/gdb/testsuite/gdb.reverse/insn-reverse.exp +++ b/gdb/testsuite/gdb.reverse/insn-reverse.exp @@ -26,7 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list debug]]} { return -1 } -if { ![runto_main] } then { +if {![runto_main]} { return } diff --git a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp index 6ef56d30e7b..71d915d20a9 100644 --- a/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp +++ b/gdb/testsuite/gdb.reverse/next-reverse-bkpt-over-sr.exp @@ -33,7 +33,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } -if ![runto_main] then { +if {![runto_main]} { return 0 } diff --git a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_2_06.exp b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_2_06.exp index 066d307fbcd..bca7399bcdf 100644 --- a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_2_06.exp +++ b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_2_06.exp @@ -37,18 +37,18 @@ set gen_src record_test_isa_2_06.c set executable record_test_isa_2_06 set options [list debug] -if {![istarget "powerpc*"]} then { +if {![istarget "powerpc*"]} { verbose "Skipping PowerPC ISA 2.06 instruction record_test_2_06." return } -if {[build_executable "failed to prepare" $executable $srcfile $options] == -1} then { +if {[build_executable "failed to prepare" $executable $srcfile $options] == -1} { return -1 } clean_restart $executable -if ![runto_main] then { +if {![runto_main]} { untested "could not run to main" return } diff --git a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp index 79f04f65b64..b4cddfac8fe 100644 --- a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp +++ b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp @@ -37,19 +37,19 @@ standard_testfile set gen_src record_test_isa_3_1.c set executable record_test_isa_3_1 -if {![istarget "powerpc*"] || [skip_power_isa_3_1_tests] } then { +if {![istarget "powerpc*"] || [skip_power_isa_3_1_tests]} { verbose "Skipping PowerPC ISA 3.1 instruction record_test." return } set options [list additional_flags=-mcpu=power10 debug] -if {[build_executable "failed to prepare" $executable $srcfile $options] == -1} then { +if {[build_executable "failed to prepare" $executable $srcfile $options] == -1} { return -1 } clean_restart $executable -if ![runto_main] then { +if {![runto_main]} { untested "could not run to main" return } diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp index 991a6b0656a..d8761753971 100644 --- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp +++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp @@ -47,7 +47,7 @@ proc test_one_sig {nextsig} { set need_another_continue 1 set missed_handler 0 - if $this_sig_supported then { + if {$this_sig_supported} { if { $thissig == "IO" } { setup_xfail "i*86-pc-linuxoldld-gnu" "i*86-pc-linuxaout-gnu" } @@ -66,7 +66,7 @@ proc test_one_sig {nextsig} { } } - if $need_another_continue then { + if {$need_another_continue} { if { $thissig == "URG" } { setup_xfail "i*86-pc-linuxoldld-gnu" "i*86-pc-linuxaout-gnu" } @@ -86,7 +86,7 @@ proc test_one_sig {nextsig} { } } - if { $missed_handler == "0" } then { + if {$missed_handler == "0"} { set testmsg "advance to $nextsig" gdb_test_multiple "signal 0" $testmsg { -re "Breakpoint.*gen_$nextsig.*kill.*$gdb_prompt $" { @@ -132,14 +132,14 @@ proc test_one_sig_reverse {prevsig} { exp_continue } -re "Breakpoint.*kill.*$gdb_prompt " { - if { $saw_signal } then { + if {$saw_signal} { pass "$testmsg (handled)" } else { xfail "$testmsg (handled)" } } -re "No more reverse-execution history.*kill.*$gdb_prompt " { - if { $saw_signal } then { + if {$saw_signal} { pass "$testmsg (handled)" } else { xfail "$testmsg (handled)" diff --git a/gdb/testsuite/gdb.reverse/sigall-reverse.exp b/gdb/testsuite/gdb.reverse/sigall-reverse.exp index 36fdb74a66f..7078067a71e 100644 --- a/gdb/testsuite/gdb.reverse/sigall-reverse.exp +++ b/gdb/testsuite/gdb.reverse/sigall-reverse.exp @@ -47,7 +47,7 @@ proc test_one_sig {nextsig} { set need_another_continue 1 set missed_handler 0 - if $this_sig_supported then { + if {$this_sig_supported} { if { $thissig == "IO" } { setup_xfail "i*86-pc-linuxoldld-gnu" "i*86-pc-linuxaout-gnu" } @@ -72,7 +72,7 @@ proc test_one_sig {nextsig} { } } - if $need_another_continue then { + if {$need_another_continue} { if { $thissig == "URG" } { setup_xfail "i*86-pc-linuxoldld-gnu" "i*86-pc-linuxaout-gnu" } @@ -92,7 +92,7 @@ proc test_one_sig {nextsig} { } } - if { $missed_handler == "0" } then { + if {$missed_handler == "0"} { set testmsg "advance to $nextsig" gdb_test_multiple "signal 0" $testmsg { -re "Breakpoint.*gen_$nextsig.*kill.*$gdb_prompt $" { @@ -138,14 +138,14 @@ proc test_one_sig_reverse {prevsig} { exp_continue } -re "Breakpoint.*kill.*$gdb_prompt " { - if { $saw_signal } then { + if {$saw_signal} { pass "$testmsg (handled)" } else { xfail "$testmsg (handled)" } } -re "No more reverse-execution history.*kill.*$gdb_prompt " { - if { $saw_signal } then { + if {$saw_signal} { pass "$testmsg (handled)" } else { xfail "$testmsg (handled)" diff --git a/gdb/testsuite/gdb.reverse/test_ioctl_TCSETSW.exp b/gdb/testsuite/gdb.reverse/test_ioctl_TCSETSW.exp index 4a81a618efc..21844e54d01 100644 --- a/gdb/testsuite/gdb.reverse/test_ioctl_TCSETSW.exp +++ b/gdb/testsuite/gdb.reverse/test_ioctl_TCSETSW.exp @@ -22,7 +22,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } -if ![runto_main] then { +if {![runto_main]} { untested "could not run to main" continue }