From 0c46b4263c49f008485b25eafffbe685c3c9031f Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 29 May 2018 07:08:34 +0000 Subject: [PATCH] [testsuite] Fix "too few/many" error messages in scan-*-times procs 2018-05-29 Tom de Vries * lib/scanasm.exp (scan-assembler-times): Use proc name in error message. * lib/scanipa.exp (scan-ipa-dump-times): Same. * lib/scanrtl.exp (scan-rtl-dump-times): Same. * lib/scantree.exp (scan-tree-dump-times): Same. From-SVN: r260859 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/lib/scanasm.exp | 4 ++-- gcc/testsuite/lib/scanipa.exp | 4 ++-- gcc/testsuite/lib/scanrtl.exp | 4 ++-- gcc/testsuite/lib/scantree.exp | 4 ++-- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fd69566696b..b5f0e1f6d67 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2018-05-29 Tom de Vries + + * lib/scanasm.exp (scan-assembler-times): Use proc name in error + message. + * lib/scanipa.exp (scan-ipa-dump-times): Same. + * lib/scanrtl.exp (scan-rtl-dump-times): Same. + * lib/scantree.exp (scan-tree-dump-times): Same. + 2018-05-29 Tom de Vries * lib/scanasm.exp (scan-stack-usage, scan-stack-usage-not) diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index 701e1f6d8fb..ad964fb6e9b 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -229,11 +229,11 @@ proc scan-ada-spec-not { args } { # Call pass if pattern is present given number of times, otherwise fail. proc scan-assembler-times { args } { if { [llength $args] < 2 } { - error "scan-assembler: too few arguments" + error "scan-assembler-times: too few arguments" return } if { [llength $args] > 3 } { - error "scan-assembler: too many arguments" + error "scan-assembler-times: too many arguments" return } if { [llength $args] >= 3 } { diff --git a/gcc/testsuite/lib/scanipa.exp b/gcc/testsuite/lib/scanipa.exp index 68f1ae36fc3..56c82c57808 100644 --- a/gcc/testsuite/lib/scanipa.exp +++ b/gcc/testsuite/lib/scanipa.exp @@ -52,11 +52,11 @@ proc scan-ipa-dump { args } { proc scan-ipa-dump-times { args } { if { [llength $args] < 3 } { - error "scan-ipa-dump: too few arguments" + error "scan-ipa-dump-times: too few arguments" return } if { [llength $args] > 4 } { - error "scan-ipa-dump: too many arguments" + error "scan-ipa-dump-times: too many arguments" return } if { [llength $args] >= 4 } { diff --git a/gcc/testsuite/lib/scanrtl.exp b/gcc/testsuite/lib/scanrtl.exp index d744e7da6d9..a24d0051668 100644 --- a/gcc/testsuite/lib/scanrtl.exp +++ b/gcc/testsuite/lib/scanrtl.exp @@ -54,11 +54,11 @@ force_conventional_output_for scan-rtl-dump proc scan-rtl-dump-times { args } { if { [llength $args] < 3 } { - error "scan-rtl-dump: too few arguments" + error "scan-rtl-dump-times: too few arguments" return } if { [llength $args] > 4 } { - error "scan-rtl-dump: too many arguments" + error "scan-rtl-dump-times: too many arguments" return } if { [llength $args] >= 4 } { diff --git a/gcc/testsuite/lib/scantree.exp b/gcc/testsuite/lib/scantree.exp index e66337a0ccf..d82719094a3 100644 --- a/gcc/testsuite/lib/scantree.exp +++ b/gcc/testsuite/lib/scantree.exp @@ -52,11 +52,11 @@ proc scan-tree-dump { args } { proc scan-tree-dump-times { args } { if { [llength $args] < 3 } { - error "scan-tree-dump: too few arguments" + error "scan-tree-dump-times: too few arguments" return } if { [llength $args] > 4 } { - error "scan-tree-dump: too many arguments" + error "scan-tree-dump-times: too many arguments" return } if { [llength $args] >= 4 } { -- 2.30.2