From aab37812b19355ad9b88d3ccb37616cf111c09d8 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 16 Jan 2003 23:05:54 -0800 Subject: [PATCH] pch.exp: Copy test header to the working directory before using it either for... * g++.dg/pch/pch.exp: Copy test header to the working directory before using it either for precompilation or direct use. * g++.dg/pch/*.Hs: Rename from gcc.dg/pch/*.H. * g++.dg/pch/*.C: Include foo.H, not foo.Hp. From-SVN: r61428 --- gcc/testsuite/ChangeLog | 7 ++++++ gcc/testsuite/g++.dg/pch/empty.C | 2 +- gcc/testsuite/g++.dg/pch/{empty.H => empty.Hs} | 0 gcc/testsuite/g++.dg/pch/pch.exp | 26 ++++++++-------------- gcc/testsuite/g++.dg/pch/system-1.C | 2 +- .../g++.dg/pch/{system-1.H => system-1.Hs} | 0 6 files changed, 18 insertions(+), 19 deletions(-) rename gcc/testsuite/g++.dg/pch/{empty.H => empty.Hs} (100%) rename gcc/testsuite/g++.dg/pch/{system-1.H => system-1.Hs} (100%) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c4f0062..4a29514 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2003-01-16 Richard Henderson + * g++.dg/pch/pch.exp: Copy test header to the working directory + before using it either for precompilation or direct use. + * g++.dg/pch/*.Hs: Rename from gcc.dg/pch/*.H. + * g++.dg/pch/*.C: Include foo.H, not foo.Hp. + +2003-01-16 Richard Henderson + * gcc.dg/pch/pch.exp: Copy test header to the working directory before using it either for precompilation or direct use. * gcc.dg/pch/*.hs: Rename from gcc.dg/pch/*.h. diff --git a/gcc/testsuite/g++.dg/pch/empty.C b/gcc/testsuite/g++.dg/pch/empty.C index 7aef099..92b3cbc 100644 --- a/gcc/testsuite/g++.dg/pch/empty.C +++ b/gcc/testsuite/g++.dg/pch/empty.C @@ -1,4 +1,4 @@ -#include "empty.Hp" +#include "empty.H" int main() { return 0; diff --git a/gcc/testsuite/g++.dg/pch/empty.H b/gcc/testsuite/g++.dg/pch/empty.Hs similarity index 100% rename from gcc/testsuite/g++.dg/pch/empty.H rename to gcc/testsuite/g++.dg/pch/empty.Hs diff --git a/gcc/testsuite/g++.dg/pch/pch.exp b/gcc/testsuite/g++.dg/pch/pch.exp index 8507e35..5b495e0 100644 --- a/gcc/testsuite/g++.dg/pch/pch.exp +++ b/gcc/testsuite/g++.dg/pch/pch.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997, 2002 Free Software Foundation, Inc. +# Copyright (C) 1997, 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,11 +36,10 @@ foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.C]] { set nshort [file tail [file dirname $test]]/[file tail $test] set bname "[file rootname [file tail $test]]" - catch { file delete "$bname.Hp.pch" } catch { file delete "$bname.H.pch" } + catch { file delete "$bname.H" } catch { file delete "$bname.s" } catch { file delete "$bname.s-pch" } - catch { file delete "$bname.Hp" } # We don't try to use the loop-optimizing options, since they are highly # unlikely to make any difference to PCH. @@ -49,30 +48,22 @@ foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.C]] { # For the header files, the default is to precompile. set dg-do-what-default precompile - dg-test -keep-output "[file rootname $test].H" $flags "" + file copy "[file rootname $test].Hs" "$bname.H" + dg-test -keep-output "$bname.H" $flags "" # For the rest, the default is to compile to .s. set dg-do-what-default compile if { [ file exists "$bname.H.pch" ] } { - # To ensure that the PCH is used, not the original header, - # the actual PCH file is renamed to ".Hp.pch". - file rename "$bname.H.pch" "$bname.Hp.pch" - if { [ is_remote host ] } { - remote_download host "$bname.Hp.pch" - } + # Ensure that the PCH file is used, not the original header. + file delete "$bname.H" dg-test -keep-output $test $flags "-I." - file delete "$bname.Hp.pch" + file delete "$bname.H.pch" if { [ file exists "$bname.s" ] } { file rename "$bname.s" "$bname.s-pch" - if { [ is_remote host ] } { - remote_upload host "[file rootname $test].H" "$bname.Hp" - } else { - file copy "[file rootname $test].H" "$bname.Hp" - } + file copy "[file rootname $test].Hs" "$bname.H" dg-test -keep-output $test $flags "-I." - remote_file host delete "$bname.Hp" set tmp [ diff "$bname.s" "$bname.s-pch" ] if { $tmp == 0 } { untested "$nshort $flags assembly comparison" @@ -81,6 +72,7 @@ foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.C]] { } else { fail "$nshort $flags assembly comparison" } + file delete "$bname.H" file delete "$bname.s" file delete "$bname.s-pch" } else { diff --git a/gcc/testsuite/g++.dg/pch/system-1.C b/gcc/testsuite/g++.dg/pch/system-1.C index a0444bc..72bea3c 100644 --- a/gcc/testsuite/g++.dg/pch/system-1.C +++ b/gcc/testsuite/g++.dg/pch/system-1.C @@ -1,4 +1,4 @@ -#include "system-1.Hp" +#include "system-1.H" int main() { diff --git a/gcc/testsuite/g++.dg/pch/system-1.H b/gcc/testsuite/g++.dg/pch/system-1.Hs similarity index 100% rename from gcc/testsuite/g++.dg/pch/system-1.H rename to gcc/testsuite/g++.dg/pch/system-1.Hs -- 2.7.4