diff mbox series

[testsuite,commited] Use correct proc names in scanasm.exp

Message ID 20180529075104.GA11081@xena
State New
Headers show
Series [testsuite,commited] Use correct proc names in scanasm.exp | expand

Commit Message

Tom de Vries May 29, 2018, 7:51 a.m. UTC 
Hi,

Consider stack-usage-1.c, which passes with:
...
PASS: gcc.dg/stack-usage-1.c (test for excess errors)
PASS: gcc.dg/stack-usage-1.c scan-file foo\t(256|264)\tstatic
...

The dg-final directive scan-file is actually not used in the source file,
instead it's scan-stack-usage:
...
/* { dg-final { scan-stack-usage "foo\t\(256|264\)\tstatic" } } */
...

so we would expect:
...
PASS: gcc.dg/stack-usage-1.c (test for excess errors)
PASS: gcc.dg/stack-usage-1.c scan-stack-usage foo\t(256|264)\tstatic
...

This patch fixes scan-stack-usage, scan-stack-usage-not, scan-ada-spec,
scan-ada-spec-not and scan-lto-assembler.

Committed as obvious.

Thanks,
- Tom

[testsuite] Use correct proc names in scanasm.exp

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

	* lib/scanasm.exp (scan-stack-usage, scan-stack-usage-not)
	(scan-ada-spec, scan-ada-spec-not, scan-lto-assembler):
	Use proc name as first argument to dg-scan.

---
 gcc/testsuite/lib/scanasm.exp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp
index 5c574d5..701e1f6 100644
--- a/gcc/testsuite/lib/scanasm.exp
+++ b/gcc/testsuite/lib/scanasm.exp
@@ -179,7 +179,7 @@  proc scan-stack-usage { args } {
     set filename [lindex $testcase 0]
     set output_file "[file rootname [file tail $filename]].su"
 
-    dg-scan "scan-file" 1 $testcase $output_file $args
+    dg-scan "scan-stack-usage" 1 $testcase $output_file $args
 }
 
 # Check that a pattern is not present in the .su file produced by the
@@ -191,7 +191,7 @@  proc scan-stack-usage-not { args } {
     set filename [lindex $testcase 0]
     set output_file "[file rootname [file tail $filename]].su"
 
-    dg-scan "scan-file-not" 0 $testcase $output_file $args
+    dg-scan "scan-stack-usage-not" 0 $testcase $output_file $args
 }
 
 # Return the filename of the Ada spec corresponding to the argument.
@@ -213,7 +213,7 @@  proc scan-ada-spec { args } {
     set testcase  [testname-for-summary]
     set output_file "[get_ada_spec_filename $testcase]"
 
-    dg-scan "scan-file" 1 $testcase $output_file $args
+    dg-scan "scan-ada-spec" 1 $testcase $output_file $args
 }
 
 # Check that a pattern is not present in the .ads file produced by the
@@ -223,7 +223,7 @@  proc scan-ada-spec-not { args } {
     set testcase  [testname-for-summary]
     set output_file "[get_ada_spec_filename $testcase]"
 
-    dg-scan "scan-file-not" 0 $testcase $output_file $args
+    dg-scan "scan-ada-spec-not" 0 $testcase $output_file $args
 }
 
 # Call pass if pattern is present given number of times, otherwise fail.
@@ -541,5 +541,5 @@  proc scan-lto-assembler { args } {
     set filename [lindex $testcase 0]
     set output_file "[file rootname [file tail $filename]].exe.ltrans0.s"
     verbose "output_file: $output_file"
-    dg-scan "scan-assembler" 1 $testcase $output_file $args
+    dg-scan "scan-lto-assembler" 1 $testcase $output_file $args
 }