[testsuite] Fix "too few/many" error messages in scan-*-times procs

2018-05-29  Tom de Vries  <tom@codesourcery.com>

	* 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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fd69566696baadb10815db051e428aa4a68f850c..b5f0e1f6d67285c46605164a7e4c72770b7df4fe 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2018-05-29  Tom de Vries  <tom@codesourcery.com>
+
+       * 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  <tom@codesourcery.com>
 
        * 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 701e1f6d8fb2b71f00b3df2ebf92ad4afa13375d..ad964fb6e9bb6eaa0a8072cf784357747461e84b 100644 (file)
--- 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 68f1ae36fc3007502625096c66b24297fe87ec9c..56c82c5780817c6a1537160439328305e63a37eb 100644 (file)
--- 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 d744e7da6d986074c80363422666d80402562d00..a24d00516680cebb414a076b8e2fab6b47e7860e 100644 (file)
--- 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 e66337a0ccfeec8175498f078cd4e128af2cc2a8..d82719094a31f4410f7c65c1cf26d3ba2ca4e967 100644 (file)
--- 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 } {