Commit 0c46b426 by Tom de Vries Committed by Tom de Vries

[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
parent e79182bb
2018-05-29 Tom de Vries <tom@codesourcery.com> 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) * lib/scanasm.exp (scan-stack-usage, scan-stack-usage-not)
(scan-ada-spec, scan-ada-spec-not, scan-lto-assembler): (scan-ada-spec, scan-ada-spec-not, scan-lto-assembler):
Use proc name as first argument to dg-scan. Use proc name as first argument to dg-scan.
......
...@@ -229,11 +229,11 @@ proc scan-ada-spec-not { args } { ...@@ -229,11 +229,11 @@ proc scan-ada-spec-not { args } {
# Call pass if pattern is present given number of times, otherwise fail. # Call pass if pattern is present given number of times, otherwise fail.
proc scan-assembler-times { args } { proc scan-assembler-times { args } {
if { [llength $args] < 2 } { if { [llength $args] < 2 } {
error "scan-assembler: too few arguments" error "scan-assembler-times: too few arguments"
return return
} }
if { [llength $args] > 3 } { if { [llength $args] > 3 } {
error "scan-assembler: too many arguments" error "scan-assembler-times: too many arguments"
return return
} }
if { [llength $args] >= 3 } { if { [llength $args] >= 3 } {
......
...@@ -52,11 +52,11 @@ proc scan-ipa-dump { args } { ...@@ -52,11 +52,11 @@ proc scan-ipa-dump { args } {
proc scan-ipa-dump-times { args } { proc scan-ipa-dump-times { args } {
if { [llength $args] < 3 } { if { [llength $args] < 3 } {
error "scan-ipa-dump: too few arguments" error "scan-ipa-dump-times: too few arguments"
return return
} }
if { [llength $args] > 4 } { if { [llength $args] > 4 } {
error "scan-ipa-dump: too many arguments" error "scan-ipa-dump-times: too many arguments"
return return
} }
if { [llength $args] >= 4 } { if { [llength $args] >= 4 } {
......
...@@ -54,11 +54,11 @@ force_conventional_output_for scan-rtl-dump ...@@ -54,11 +54,11 @@ force_conventional_output_for scan-rtl-dump
proc scan-rtl-dump-times { args } { proc scan-rtl-dump-times { args } {
if { [llength $args] < 3 } { if { [llength $args] < 3 } {
error "scan-rtl-dump: too few arguments" error "scan-rtl-dump-times: too few arguments"
return return
} }
if { [llength $args] > 4 } { if { [llength $args] > 4 } {
error "scan-rtl-dump: too many arguments" error "scan-rtl-dump-times: too many arguments"
return return
} }
if { [llength $args] >= 4 } { if { [llength $args] >= 4 } {
......
...@@ -52,11 +52,11 @@ proc scan-tree-dump { args } { ...@@ -52,11 +52,11 @@ proc scan-tree-dump { args } {
proc scan-tree-dump-times { args } { proc scan-tree-dump-times { args } {
if { [llength $args] < 3 } { if { [llength $args] < 3 } {
error "scan-tree-dump: too few arguments" error "scan-tree-dump-times: too few arguments"
return return
} }
if { [llength $args] > 4 } { if { [llength $args] > 4 } {
error "scan-tree-dump: too many arguments" error "scan-tree-dump-times: too many arguments"
return return
} }
if { [llength $args] >= 4 } { if { [llength $args] >= 4 } {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment