scanasm.exp (scan-assembler, [...]): Don't strip torture options from test name.

	* lib/scanasm.exp (scan-assembler, scan-assembler-not, scan-hidden,
	scan-not-hiddent, scan-file, scan-file-not, scan-stack-usage,
	scan-stack-usage-not): Don't strip torture options from test name.

From-SVN: r188539

gcc/testsuite/ChangeLog

 2012-06-13  Janis Johnson  <janisjo@codesourcery.com>
 
+	* lib/scanasm.exp (scan-assembler, scan-assembler-not, scan-hidden,
+	scan-not-hiddent, scan-file, scan-file-not, scan-stack-usage,
+	scan-stack-usage-not): Don't strip torture options from test name.
+
 	* lib/scandump.exp (scan-dump-times): Use printable version of
 	regexp in test summary line.
 

gcc/testsuite/lib/scanasm.exp

@@ -79,9 +79,10 @@ proc dg-scan { name positive testcase output_file orig_args } {
 
 proc scan-assembler { args } {
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
     set output_file "[file rootname [file tail $testcase]].s"
-
     dg-scan "scan-assembler" 1 $testcase $output_file $args
 }
 
@@ -95,7 +96,9 @@ proc scan-assembler_required_options { args } {
 
 proc scan-assembler-not { args } {
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
     set output_file "[file rootname [file tail $testcase]].s"
 
     dg-scan "scan-assembler-not" 0 $testcase $output_file $args
@@ -126,7 +129,9 @@ proc hidden-scan-for { symbol } {
 
 proc scan-hidden { args } {
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
     set output_file "[file rootname [file tail $testcase]].s"
 
     set symbol [lindex $args 0]
@@ -143,7 +148,9 @@ proc scan-hidden { args } {
 
 proc scan-not-hidden { args } {
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
     set output_file "[file rootname [file tail $testcase]].s"
 
     set symbol [lindex $args 0]
@@ -158,7 +165,9 @@ proc scan-not-hidden { args } {
 
 proc scan-file { output_file args } {
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
     dg-scan "scan-file" 1 $testcase $output_file $args
 }
 
@@ -167,7 +176,9 @@ proc scan-file { output_file args } {
 
 proc scan-file-not { output_file args } {
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
     dg-scan "scan-file-not" 0 $testcase $output_file $args
 }
 
@@ -176,7 +187,9 @@ proc scan-file-not { output_file args } {
 
 proc scan-stack-usage { args } {
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
     set output_file "[file rootname [file tail $testcase]].su"
 
     dg-scan "scan-file" 1 $testcase $output_file $args
@@ -187,7 +200,9 @@ proc scan-stack-usage { args } {
 
 proc scan-stack-usage-not { args } {
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
     set output_file "[file rootname [file tail $testcase]].su"
 
     dg-scan "scan-file-not" 0 $testcase $output_file $args
@@ -216,7 +231,9 @@ proc scan-assembler-times { args } {
     # it still stores the filename of the testcase in a local variable "name".
     # A cleaner solution would require a new dejagnu release.
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
 
     set pattern [lindex $args 0]
     set pp_pattern [make_pattern_printable $pattern]
@@ -276,7 +293,9 @@ proc scan-assembler-dem { args } {
     }
 
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
     set pattern [lindex $args 0]
     set pp_pattern [make_pattern_printable $pattern]
     set output_file "[file rootname [file tail $testcase]].s"
@@ -331,7 +350,9 @@ proc scan-assembler-dem-not { args } {
     }
 
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
     set pattern [lindex $args 0]
     set pp_pattern [make_pattern_printable $pattern]
     set output_file "[file rootname [file tail $testcase]].s"
@@ -387,7 +408,9 @@ proc object-size { args } {
     }
 
     upvar 2 name testcase
-    set testcase [lindex $testcase 0]
+    if { [llength $testcase] > 1 } {
+	set testcase "$testcase "
+    }
 
     set what [lindex $args 0]
     set where [lsearch { text data bss total } $what]