From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <aburgess@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1726)
	id 835B6385843D; Mon, 28 Nov 2022 21:05:20 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 835B6385843D
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1669669520;
	bh=WKf8gDQs8aEOi7zC/DNonRWi4UoSkjeUILXZINY+TbA=;
	h=From:To:Subject:Date:From;
	b=CSh19/AjUwQKSfeHIT1npGjYSd+t8O9aJHgKlymt5ZTMe2OiFCk09o8JN9CUNJ0ra
	 axjfLnzCD5ef0gTgZDngpaECBxB8frLl46Ibk8Dr32ULVM6Lhsc7Srz6uA3f1ii2Zm
	 xPCzqSqGgCHUKDOpqrxVJgp6jQUdxjLw23GSCdk4=
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Andrew Burgess <aburgess@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] gdb/testsuite: remove use of then keyword from gdb.disasm/*.exp
X-Act-Checkin: binutils-gdb
X-Git-Author: Andrew Burgess <aburgess@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: bde43e8dbeaf4c9b05514f0c749623db453747bb
X-Git-Newrev: 6ca2ea063a71d6e2742096f980c2607e9d413cf5
Message-Id: <20221128210520.835B6385843D@sourceware.org>
Date: Mon, 28 Nov 2022 21:05:20 +0000 (GMT)
List-Id: <gdb-cvs.sourceware.org>

https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D6ca2ea063a71=
d6e2742096f980c2607e9d413cf5

commit 6ca2ea063a71d6e2742096f980c2607e9d413cf5
Author: Andrew Burgess <aburgess@redhat.com>
Date:   Mon Nov 14 14:22:46 2022 +0000

    gdb/testsuite: remove use of then keyword from gdb.disasm/*.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.disasm/
    test script directory.
   =20
    There should be no changes in what is tested after this commit.

Diff:
---
 gdb/testsuite/gdb.disasm/t01_mov.exp  | 4 ++--
 gdb/testsuite/gdb.disasm/t02_mova.exp | 4 ++--
 gdb/testsuite/gdb.disasm/t03_add.exp  | 4 ++--
 gdb/testsuite/gdb.disasm/t04_sub.exp  | 4 ++--
 gdb/testsuite/gdb.disasm/t05_cmp.exp  | 4 ++--
 gdb/testsuite/gdb.disasm/t06_ari2.exp | 4 ++--
 gdb/testsuite/gdb.disasm/t07_ari3.exp | 4 ++--
 gdb/testsuite/gdb.disasm/t08_or.exp   | 4 ++--
 gdb/testsuite/gdb.disasm/t09_xor.exp  | 4 ++--
 gdb/testsuite/gdb.disasm/t10_and.exp  | 4 ++--
 gdb/testsuite/gdb.disasm/t11_logs.exp | 4 ++--
 gdb/testsuite/gdb.disasm/t12_bit.exp  | 4 ++--
 gdb/testsuite/gdb.disasm/t13_otr.exp  | 4 ++--
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/gdb/testsuite/gdb.disasm/t01_mov.exp b/gdb/testsuite/gdb.disas=
m/t01_mov.exp
index c9efa34f7c6..2e29baccc18 100644
--- a/gdb/testsuite/gdb.disasm/t01_mov.exp
+++ b/gdb/testsuite/gdb.disasm/t01_mov.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t02_mova.exp b/gdb/testsuite/gdb.disa=
sm/t02_mova.exp
index 3fcb0be5e2b..67d3d5f11c6 100644
--- a/gdb/testsuite/gdb.disasm/t02_mova.exp
+++ b/gdb/testsuite/gdb.disasm/t02_mova.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t03_add.exp b/gdb/testsuite/gdb.disas=
m/t03_add.exp
index 0a5a914e0c8..b2f2289f585 100644
--- a/gdb/testsuite/gdb.disasm/t03_add.exp
+++ b/gdb/testsuite/gdb.disasm/t03_add.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t04_sub.exp b/gdb/testsuite/gdb.disas=
m/t04_sub.exp
index 4f4353e0df6..5ac5829d60f 100644
--- a/gdb/testsuite/gdb.disasm/t04_sub.exp
+++ b/gdb/testsuite/gdb.disasm/t04_sub.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t05_cmp.exp b/gdb/testsuite/gdb.disas=
m/t05_cmp.exp
index 534f81650db..a1c704151c9 100644
--- a/gdb/testsuite/gdb.disasm/t05_cmp.exp
+++ b/gdb/testsuite/gdb.disasm/t05_cmp.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t06_ari2.exp b/gdb/testsuite/gdb.disa=
sm/t06_ari2.exp
index ab5ffdd5fa0..c7de7336217 100644
--- a/gdb/testsuite/gdb.disasm/t06_ari2.exp
+++ b/gdb/testsuite/gdb.disasm/t06_ari2.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t07_ari3.exp b/gdb/testsuite/gdb.disa=
sm/t07_ari3.exp
index 810dc0e2311..7937925e70a 100644
--- a/gdb/testsuite/gdb.disasm/t07_ari3.exp
+++ b/gdb/testsuite/gdb.disasm/t07_ari3.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t08_or.exp b/gdb/testsuite/gdb.disasm=
/t08_or.exp
index 5ade4eb770e..fdfa0a1b301 100644
--- a/gdb/testsuite/gdb.disasm/t08_or.exp
+++ b/gdb/testsuite/gdb.disasm/t08_or.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t09_xor.exp b/gdb/testsuite/gdb.disas=
m/t09_xor.exp
index 8c8f584e136..7e246753367 100644
--- a/gdb/testsuite/gdb.disasm/t09_xor.exp
+++ b/gdb/testsuite/gdb.disasm/t09_xor.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t10_and.exp b/gdb/testsuite/gdb.disas=
m/t10_and.exp
index c096737019f..5650aebba1c 100644
--- a/gdb/testsuite/gdb.disasm/t10_and.exp
+++ b/gdb/testsuite/gdb.disasm/t10_and.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t11_logs.exp b/gdb/testsuite/gdb.disa=
sm/t11_logs.exp
index 7511b84c28d..2b58273c307 100644
--- a/gdb/testsuite/gdb.disasm/t11_logs.exp
+++ b/gdb/testsuite/gdb.disasm/t11_logs.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t12_bit.exp b/gdb/testsuite/gdb.disas=
m/t12_bit.exp
index 1020986f331..e58412128f3 100644
--- a/gdb/testsuite/gdb.disasm/t12_bit.exp
+++ b/gdb/testsuite/gdb.disasm/t12_bit.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }
diff --git a/gdb/testsuite/gdb.disasm/t13_otr.exp b/gdb/testsuite/gdb.disas=
m/t13_otr.exp
index 70fbd1310e1..61b300f511f 100644
--- a/gdb/testsuite/gdb.disasm/t13_otr.exp
+++ b/gdb/testsuite/gdb.disasm/t13_otr.exp
@@ -30,12 +30,12 @@ set asm-flags ""
 set link-flags "-m h8300sxelf"
=20
=20
-if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} then {
+if {[target_assemble $srcfile $objfile "${asm-flags}"] !=3D ""} {
      untested "failed to assemble"
      return -1
 }
=20
-if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} then {
+if {[target_link $objfile $binfile "${link-flags}"] !=3D ""} {
      untested "failed to link"
      return -1
 }