diff options
| author | Janis Johnson <janisjo@codesourcery.com> | 2012-06-13 22:55:56 +0000 |
|---|---|---|
| committer | Janis Johnson <janis@gcc.gnu.org> | 2012-06-13 22:55:56 +0000 |
| commit | 8564f92726e23036b8fc7e2848a53df1d07694c5 (patch) | |
| tree | 3440fe524bccf078f9bfa3867fa5c55c479e645f | |
| parent | 78a5a56849b3f72268ee66d8aaec44d24f0a5ac5 (diff) | |
| download | gcc-8564f92726e23036b8fc7e2848a53df1d07694c5.zip gcc-8564f92726e23036b8fc7e2848a53df1d07694c5.tar.gz gcc-8564f92726e23036b8fc7e2848a53df1d07694c5.tar.bz2 | |
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
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/dg-pch.exp | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 92bff75..2974fde 100644 --- 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 822a2b0..b1fadaba 100644 --- 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 +} |