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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 92bff75b1eb681f23f92c1c7562e937f9e518950..2974fde11c28b1930c37f380777708df7458540d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 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,
        scan-not-hiddent, scan-file, scan-file-not, scan-stack-usage,
        scan-stack-usage-not): Don't strip torture options from test name.

diff --git a/gcc/testsuite/lib/dg-pch.exp b/gcc/testsuite/lib/dg-pch.exp
index 822a2b0d33acb263a7493a83ced207c665d6e715..b1fadabaaf8772fd9da86cc0d30295ffcc59ea42 100644 (file)
--- a/gcc/testsuite/lib/dg-pch.exp
+++ b/gcc/testsuite/lib/dg-pch.exp
@@ -50,14 +50,16 @@ proc dg-flags-pch { subdir test otherflags options suffix } {
            # Ensure that the PCH file is used, not the original header.
            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"
            if { !$have_errs } {
                if { [ file_on_host exists "$bname.s" ] } {
                    remote_upload host "$bname.s" "$bname.s-gch"
                    remote_download host "$bname.s-gch"
                    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"
                    set tmp [ diff "$bname.s" "$bname.s-gch" ]
                    if { $tmp == 0 } {
@@ -89,4 +91,4 @@ proc dg-flags-pch { subdir test otherflags options suffix } {
 
 proc dg-pch { subdir test options suffix } {
   return [dg-flags-pch $subdir $test "" $options $suffix]
-}
\ No newline at end of file
+}