diff mbox

gcc parallel make check

Message ID 547491DC.3020302@mentor.com
State New
Headers show

Commit Message

Tom de Vries Nov. 25, 2014, 2:27 p.m. UTC 
On 15-09-14 18:05, Jakub Jelinek wrote:
> libstdc++-v3/
> 	* testsuite/Makefile.am (check_p_numbers0, check_p_numbers1,
> 	check_p_numbers2, check_p_numbers3, check_p_numbers4,
> 	check_p_numbers5, check_p_numbers6, check_p_numbers,
> 	check_p_subdirs): New variables.
> 	(check_DEJAGNU_normal_targets): Use check_p_subdirs.
> 	(check-DEJAGNU): Rewritten so that for parallelized
> 	testing each job runs all the *.exp files, with
> 	GCC_RUNTEST_PARALLELIZE_DIR set in environment.
> 	* testsuite/Makefile.in: Regenerated.
> 	* testsuite/lib/libstdc++.exp (gcc_parallel_test_run_p,
> 	gcc_parallel_test_enable): New procedures.  If
> 	GCC_RUNTEST_PARALLELIZE_DIR is set in environment, override
> 	runtest_file_p to invoke also gcc_parallel_test_run_p.
> 	* testsuite/libstdc++-abi/abi.exp: Run all the tests serially
> 	by the first parallel runtest encountering it.  Fix up path
> 	of the extract_symvers script.
> 	* testsuite/libstdc++-xmethods/xmethods.exp: Run all the tests
> 	serially by the first parallel runtest encountering it.  Run
> 	dg-finish even in case of error.

When comparing test results of patch builds with test results of reference 
builds, the only differences I'm seeing are random differences in amount of 
'UNSUPPORTED: prettyprinter.exp'.

This patch fixes that by ensuring that we print that unsupported message only once.

The resulting test result comparison diff is:
...
--- without/FAIL  2014-11-24 17:46:32.202673282 +0100
+++ with/FAIL     2014-11-25 13:45:15.636131571 +0100
  libstdc++-v3/testsuite/libstdc++.sum:UNSUPPORTED: prettyprinters.exp
-libstdc++-v3/testsuite/libstdc++.sum:UNSUPPORTED: prettyprinters.exp
-libstdc++-v3/testsuite/libstdc++.sum:UNSUPPORTED: prettyprinters.exp
-libstdc++-v3/testsuite/libstdc++.sum:UNSUPPORTED: prettyprinters.exp
-libstdc++-v3/testsuite/libstdc++.sum:UNSUPPORTED: prettyprinters.exp
  libstdc++-v3/testsuite/libstdc++.sum:UNSUPPORTED: xmethods.exp
...

Furthermore, the patch adds a dg-finish in case the prettyprinters.exp file is 
unsupported, which AFAIU is also required in that case.

Bootstrapped and reg-tested on x86_64.

OK for trunk/stage3?

Thanks,
- Tom

Comments

Jakub Jelinek Nov. 25, 2014, 8:15 p.m. UTC | #1 
On Tue, Nov 25, 2014 at 03:27:40PM +0100, Tom de Vries wrote:
> This patch fixes that by ensuring that we print that unsupported message only once.
> 
> The resulting test result comparison diff is:
> 2014-11-25  Tom de Vries  <tom@codesourcery.com>
> 
> 	* testsuite/libstdc++-prettyprinters/prettyprinters.exp: Add missing
> 	dg-finish.  Only print unsupported message once.

LGTM.

> --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp
> +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp
> @@ -30,7 +30,14 @@ if ![info exists ::env(GUALITY_GDB_NAME)] {
>  }
>  
>  if {! [gdb_version_check]} {
> +    dg-finish
> +    # Only print unsupported message in one instance.
> +    if ![gcc_parallel_test_run_p prettyprinters] {
> +	return
> +    }
> +    gcc_parallel_test_enable 0
>      unsupported "prettyprinters.exp"
> +    gcc_parallel_test_enable 1
>      return
>  }
>  
> -- 
> 1.9.1
> 


	Jakub
Mike Stump Nov. 26, 2014, 4:59 a.m. UTC | #2 
On Nov 25, 2014, at 12:15 PM, Jakub Jelinek <jakub@redhat.com> wrote:
> On Tue, Nov 25, 2014 at 03:27:40PM +0100, Tom de Vries wrote:
>> This patch fixes that by ensuring that we print that unsupported message only once.
>> 
>> The resulting test result comparison diff is:
>> 2014-11-25  Tom de Vries  <tom@codesourcery.com>
>> 
>>    * testsuite/libstdc++-prettyprinters/prettyprinters.exp: Add missing
>>    dg-finish.  Only print unsupported message once.
> 
> LGTM.

That is the approval.  :-)
diff mbox

Patch

2014-11-25  Tom de Vries  <tom@codesourcery.com>

	* testsuite/libstdc++-prettyprinters/prettyprinters.exp: Add missing
	dg-finish.  Only print unsupported message once.
---
 libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp b/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp
index a57660f..e5be5b5 100644
--- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp
@@ -30,7 +30,14 @@  if ![info exists ::env(GUALITY_GDB_NAME)] {
 }
 
 if {! [gdb_version_check]} {
+    dg-finish
+    # Only print unsupported message in one instance.
+    if ![gcc_parallel_test_run_p prettyprinters] {
+	return
+    }
+    gcc_parallel_test_enable 0
     unsupported "prettyprinters.exp"
+    gcc_parallel_test_enable 1
     return
 }
 
-- 
1.9.1