Patchwork [C++/testsuite] Remove pchtest check objects and compile with current tool

login
register
mail settings
Submitter aldot
Date Nov. 9, 2013, 1:34 p.m.
Message ID <CAC1BbcT==xfHu6LpU_AOO8qp+GBZkfYLMwVQaXiG5zsNpJP-+g@mail.gmail.com>
Download mbox | patch
Permalink /patch/289993/
State New
Headers show

Comments

aldot - Nov. 9, 2013, 1:34 p.m.
On 1 November 2013 02:15, Mike Stump <mikestump@comcast.net> wrote:
> On Oct 31, 2013, at 1:47 AM, Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:
>> On 30 October 2013 23:22, Mike Stump <mikestump@comcast.net> wrote:
>>> On Oct 30, 2013, at 3:14 PM, Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:
>>>> On 30 October 2013 22:47, Mike Stump <mikestump@comcast.net> wrote:
>>>>>
>>>>> Was there a significant purpose for the added C++ comment?  If not, can you remove that?  If so, can you explain?
>>>>
>>>> grep -A9 "CONTENTS is" gcc/testsuite/lib/target-supports.exp
>>>> # Assume by default that CONTENTS is C code.
>>>> # Otherwise, code should contain:
>>>> # "// C++" for c++,
>>>> # "! Fortran" for Fortran code,
>>>> # "/* ObjC", for ObjC
>>>> # "// ObjC++" for ObjC++
>>>> # and "// Go" for Go
>>>> # If the tool is ObjC/ObjC++ then we overide the extension to .m/.mm to
>>>> # allow for ObjC/ObjC++ specific flags.
>>>> proc check_compile {basename type contents args} {
>>>
>>> Ah, but this is why I asked for a significant purpose?  The language of the file selects the options (flags) allowed.  The language is set in your code.  I think it was part of trying different ways to fix it, but, it turned out to be neither necessary or sufficient in the end.
>>
>> Not sure about any significant purpose, no.
>
> Ok, then it can be safely removed.
>
>> So, what do you want me to do?
>
> Remove the added comment…   and repost…
>
> Thanks.

Attached.

Ok for trunk?

gcc/testsuite/ChangeLog

2013-10-12  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>

        * lib/dg-pch.exp (pch-init): Remove pchtest check objects.


Oh, and while double-checking the auto-wipe patch that i just
simplified, i encountered an inconvenient side-effect of checking
pristine trunk with plain
$ make -k check -j4
versus my local tree with
$ make -k check -j4 RUNTESTFLAGS="-v -v -v -v "

This bug/feature was added in a0d20ccbd97fde9c2af1f7345e3eb1313dea570f
aka svn r141337 .
From the sounds, if --target_board= is seen, then run specific test, serial.
Otherwise do the parallel stuff, i.e. check_DEJAGNU_normal_targets.
.
Still i want -v to not behave differently as not passing -v in
RUNTESTFLAGS especially regarding parallelism, so what about doing:
   for idx in 0 1 2 3 4 5 6 7 8 9; do \

This may run non-parallel if somebody has RUNTESTFLAGS=" -v -v
--target_board=" but at least we don't have -v --verbose -d --debug in
the filter-out.
Mike?

Thanks,
diff --git a/gcc/testsuite/lib/dg-pch.exp b/gcc/testsuite/lib/dg-pch.exp
index d82c669..7bc5c45 100644
--- a/gcc/testsuite/lib/dg-pch.exp
+++ b/gcc/testsuite/lib/dg-pch.exp
@@ -30,6 +30,7 @@ proc pch-init { args } {
     set pch_unsupported_debug \
 	[regexp "debug format cannot be used with pre-compiled headers" \
 		[lindex $result 0]]
+    remove-build-file [lindex $result 1]
 
     set pch_unsupported 0
     if { $pch_unsupported_debug } {
@@ -40,6 +41,7 @@ proc pch-init { args } {
 		[regexp "debug format cannot be used with pre-compiled headers" \
 			[lindex $result 0]]
     }
+    remove-build-file [lindex $result 1]
 }
 
 proc pch-finish { args } {
Mike Stump - Nov. 9, 2013, 5:15 p.m.
On Nov 9, 2013, at 5:34 AM, Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:
> Ok for trunk?

> 2013-10-12  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
> 
>        * lib/dg-pch.exp (pch-init): Remove pchtest check objects.

Ok.

The code that does set chk_lang "c++-header", but just not the code that puts in the comment, is fine to repost as well.

> Oh, and while double-checking the auto-wipe patch that i just
> simplified, i encountered an inconvenient side-effect of checking
> pristine trunk with plain
> $ make -k check -j4
> versus my local tree with
> $ make -k check -j4 RUNTESTFLAGS="-v -v -v -v "
> 
> This bug/feature was added in a0d20ccbd97fde9c2af1f7345e3eb1313dea570f
> aka svn r141337 .
> From the sounds, if --target_board= is seen, then run specific test, serial.
> Otherwise do the parallel stuff, i.e. check_DEJAGNU_normal_targets.
> .
> Still i want -v to not behave differently as not passing -v in
> RUNTESTFLAGS especially regarding parallelism, so what about doing:
> diff --git a/libstdc++-v3/testsuite/Makefile.am
> b/libstdc++-v3/testsuite/Makefile.am
> index 4c92fef..6edc410 100644
> --- a/libstdc++-v3/testsuite/Makefile.am
> +++ b/libstdc++-v3/testsuite/Makefile.am
> @@ -108,7 +108,7 @@ $(check_DEJAGNU_normal_targets):
> check-DEJAGNUnormal%: normal%/site.exp
> check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
>  AR="$(AR)"; export AR; \
>  RANLIB="$(RANLIB)"; export RANLIB; \
> - if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \
> + if [ -z "$*$findstring --target_board=,$(RUNTESTFLAGS))" ] \
>     && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
>   $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \
>   for idx in 0 1 2 3 4 5 6 7 8 9; do \
> 
> This may run non-parallel if somebody has RUNTESTFLAGS=" -v -v
> --target_board=" but at least we don't have -v --verbose -d --debug in
> the filter-out.
> Mike?

Head, hurts; can you discuss with jakub.  I just want to get out of the way and let you two decide what is best.

Patch

diff --git a/libstdc++-v3/testsuite/Makefile.am
b/libstdc++-v3/testsuite/Makefile.am
index 4c92fef..6edc410 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -108,7 +108,7 @@  $(check_DEJAGNU_normal_targets):
check-DEJAGNUnormal%: normal%/site.exp
 check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
  AR="$(AR)"; export AR; \
  RANLIB="$(RANLIB)"; export RANLIB; \
- if [ -z "$*$(filter-out --target_board=%, $(RUNTESTFLAGS))" ] \
+ if [ -z "$*$findstring --target_board=,$(RUNTESTFLAGS))" ] \
     && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
   $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \