Commit 8564f927 by Janis Johnson Committed by Janis Johnson

re PR testsuite/20771 (Duplicate PCH test names)

	PR testsuite/20771
	* lib/dg-pch.exp (dg-flags-pch): Add flags to make compile lines in
	test summary unique.

From-SVN: r188540
parent 78a5a568
2012-06-13 Janis Johnson <janisjo@codesourcery.com> 2012-06-13 Janis Johnson <janisjo@codesourcery.com>
PR testsuite/20771
* lib/dg-pch.exp (dg-flags-pch): Add flags to make compile lines in
test summary unique.
* lib/scanasm.exp (scan-assembler, scan-assembler-not, scan-hidden, * lib/scanasm.exp (scan-assembler, scan-assembler-not, scan-hidden,
scan-not-hiddent, scan-file, scan-file-not, scan-stack-usage, scan-not-hiddent, scan-file, scan-file-not, scan-stack-usage,
scan-stack-usage-not): Don't strip torture options from test name. scan-stack-usage-not): Don't strip torture options from test name.
......
...@@ -50,14 +50,16 @@ proc dg-flags-pch { subdir test otherflags options suffix } { ...@@ -50,14 +50,16 @@ proc dg-flags-pch { subdir test otherflags options suffix } {
# Ensure that the PCH file is used, not the original header. # Ensure that the PCH file is used, not the original header.
file_on_host delete "$bname$suffix" file_on_host delete "$bname$suffix"
dg-test -keep-output $test "$otherflags $flags -I." "" # The flags "-Dwith_PCH" and "-Dwithout_PCH" are to distinguish the
# two compiles in test summary lines.
dg-test -keep-output $test "$otherflags $flags -I. -Dwith_PCH" ""
file_on_host delete "$bname$suffix.gch" file_on_host delete "$bname$suffix.gch"
if { !$have_errs } { if { !$have_errs } {
if { [ file_on_host exists "$bname.s" ] } { if { [ file_on_host exists "$bname.s" ] } {
remote_upload host "$bname.s" "$bname.s-gch" remote_upload host "$bname.s" "$bname.s-gch"
remote_download host "$bname.s-gch" remote_download host "$bname.s-gch"
gcc_copy_files "[file rootname $test]${suffix}s" "$bname$suffix" gcc_copy_files "[file rootname $test]${suffix}s" "$bname$suffix"
dg-test -keep-output $test "$otherflags $flags -I." "" dg-test -keep-output $test "$otherflags $flags -I. -Dwithout_PCH" ""
remote_upload host "$bname.s" remote_upload host "$bname.s"
set tmp [ diff "$bname.s" "$bname.s-gch" ] set tmp [ diff "$bname.s" "$bname.s-gch" ]
if { $tmp == 0 } { if { $tmp == 0 } {
...@@ -89,4 +91,4 @@ proc dg-flags-pch { subdir test otherflags options suffix } { ...@@ -89,4 +91,4 @@ proc dg-flags-pch { subdir test otherflags options suffix } {
proc dg-pch { subdir test options suffix } { proc dg-pch { subdir test options suffix } {
return [dg-flags-pch $subdir $test "" $options $suffix] return [dg-flags-pch $subdir $test "" $options $suffix]
} }
\ No newline at end of file
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