From e79182bb71d54c18f518f402df83bba2af0857f6 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 29 May 2018 07:08:23 +0000 Subject: [PATCH] [testsuite] Use correct proc names in scanasm.exp 2018-05-29 Tom de Vries * 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. From-SVN: r260858 --- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/lib/scanasm.exp | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 43210ab8248..fd69566696b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-05-29 Tom de Vries + + * 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. + 2018-05-29 Tom de Vries * lib/scanasm.exp (scan-hidden, scan-not-hidden): Handle being called diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index 5c574d550cb..701e1f6d8fb 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 } -- 2.30.2