Patchwork [4.7] Enable the libstdc++ prettyprinters test suite

login
register
mail settings
Submitter Michael Hope
Date July 25, 2012, 12:12 a.m.
Message ID <500F39E1.6080209@linaro.org>
Download mbox | patch
Permalink /patch/173084/
State New
Headers show

Comments

Michael Hope - July 25, 2012, 12:12 a.m.
The libstdc++ prettyprinters test suite isn't called out in Makefile.am.  Backport Andreas's
patch from mainline so that a sequential test run gives the same results as a parallel test.

Tested with no regressions on x86_64-linux-gnu and arm-linux-gnueabi.  The prettyprinter
tests are enabled as expected.

OK for 4.7?

-- Michael

2012-07-25  Michael Hope  <michael.hope@linaro.org>

	Backport from mainline r186389:
	2012-04-12  Andreas Schwab  <schwab@linux-m68k.org>

	* testsuite/Makefile.am (check_DEJAGNUnormal0): Run
	prettyprinters.exp.
	* testsuite/Makefile.in: Regenerated.
Michael Hope - July 31, 2012, 9:29 p.m.
cc'ed the libstdc++ list.  Ping?

-- Michael

On 25/07/12 12:12, Michael Hope wrote:
> The libstdc++ prettyprinters test suite isn't called out in Makefile.am.  Backport Andreas's
> patch from mainline so that a sequential test run gives the same results as a parallel test.
>
> Tested with no regressions on x86_64-linux-gnu and arm-linux-gnueabi.  The prettyprinter
> tests are enabled as expected.
>
> OK for 4.7?
>
> -- Michael
>
> 2012-07-25  Michael Hope  <michael.hope@linaro.org>
>
>      Backport from mainline r186389:
>      2012-04-12  Andreas Schwab  <schwab@linux-m68k.org>
>
>      * testsuite/Makefile.am (check_DEJAGNUnormal0): Run
>      prettyprinters.exp.
>      * testsuite/Makefile.in: Regenerated.
>
> diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
> index 7094ad5..0cf8de5 100644
> --- a/libstdc++-v3/testsuite/Makefile.am
> +++ b/libstdc++-v3/testsuite/Makefile.am
> @@ -134,7 +134,7 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
>         normal0) \
>           if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
>             $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
> -            $(RUNTESTFLAGS) abi.exp; \
> +            $(RUNTESTFLAGS) abi.exp prettyprinters.exp; \
>           else echo "WARNING: could not find \`runtest'" 1>&2; :;\
>           fi; \
>           dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
> diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
> index e433bb9..bb077d1 100644
> --- a/libstdc++-v3/testsuite/Makefile.in
> +++ b/libstdc++-v3/testsuite/Makefile.in
> @@ -572,7 +572,7 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
>         normal0) \
>           if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
>             $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
> -            $(RUNTESTFLAGS) abi.exp; \
> +            $(RUNTESTFLAGS) abi.exp prettyprinters.exp; \
>           else echo "WARNING: could not find \`runtest'" 1>&2; :;\
>           fi; \
>           dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
Jonathan Wakely - Aug. 1, 2012, 6:58 p.m.
On 31 July 2012 22:29, Michael Hope wrote:
> cc'ed the libstdc++ list.  Ping?

OK for 4.7


> -- Michael
>
> On 25/07/12 12:12, Michael Hope wrote:
>>
>> The libstdc++ prettyprinters test suite isn't called out in Makefile.am.
>> Backport Andreas's
>> patch from mainline so that a sequential test run gives the same results
>> as a parallel test.
>>
>> Tested with no regressions on x86_64-linux-gnu and arm-linux-gnueabi.  The
>> prettyprinter
>> tests are enabled as expected.
>>
>> OK for 4.7?
>>
>> -- Michael
>>
>> 2012-07-25  Michael Hope  <michael.hope@linaro.org>
>>
>>      Backport from mainline r186389:
>>      2012-04-12  Andreas Schwab  <schwab@linux-m68k.org>
>>
>>      * testsuite/Makefile.am (check_DEJAGNUnormal0): Run
>>      prettyprinters.exp.
>>      * testsuite/Makefile.in: Regenerated.
>>
>> diff --git a/libstdc++-v3/testsuite/Makefile.am
>> b/libstdc++-v3/testsuite/Makefile.am
>> index 7094ad5..0cf8de5 100644
>> --- a/libstdc++-v3/testsuite/Makefile.am
>> +++ b/libstdc++-v3/testsuite/Makefile.am
>> @@ -134,7 +134,7 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets):
>> check-DEJAGNU%: site.exp
>>         normal0) \
>>           if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
>>             $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
>> -            $(RUNTESTFLAGS) abi.exp; \
>> +            $(RUNTESTFLAGS) abi.exp prettyprinters.exp; \
>>           else echo "WARNING: could not find \`runtest'" 1>&2; :;\
>>           fi; \
>>           dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
>> diff --git a/libstdc++-v3/testsuite/Makefile.in
>> b/libstdc++-v3/testsuite/Makefile.in
>> index e433bb9..bb077d1 100644
>> --- a/libstdc++-v3/testsuite/Makefile.in
>> +++ b/libstdc++-v3/testsuite/Makefile.in
>> @@ -572,7 +572,7 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets):
>> check-DEJAGNU%: site.exp
>>         normal0) \
>>           if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
>>             $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
>> -            $(RUNTESTFLAGS) abi.exp; \
>> +            $(RUNTESTFLAGS) abi.exp prettyprinters.exp; \
>>           else echo "WARNING: could not find \`runtest'" 1>&2; :;\
>>           fi; \
>>           dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
>
>

Patch

diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index 7094ad5..0cf8de5 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -134,7 +134,7 @@  check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
  	  normal0) \
  	    if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
  	      $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
-			$(RUNTESTFLAGS) abi.exp; \
+			$(RUNTESTFLAGS) abi.exp prettyprinters.exp; \
  	    else echo "WARNING: could not find \`runtest'" 1>&2; :;\
  	    fi; \
  	    dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index e433bb9..bb077d1 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -572,7 +572,7 @@  check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
  	  normal0) \
  	    if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
  	      $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
-			$(RUNTESTFLAGS) abi.exp; \
+			$(RUNTESTFLAGS) abi.exp prettyprinters.exp; \
  	    else echo "WARNING: could not find \`runtest'" 1>&2; :;\
  	    fi; \
  	    dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \