[COMMITTED] Avoid more C++ tests.
diff mbox

Message ID 20150304221905.BDA102C3B7B@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath March 4, 2015, 10:19 p.m. UTC
Missed the ones in elf/ that don't actually link with -lstdc++ but need
C++ headers that will also be missing when libstdc++ is missing.


Thanks,
Roland

	* elf/Makefile (tests, modules-names): Likewise for tst-unique3,
	tst-unique3lib, tst-unique3lib2, tst-unique4, and tst-unique4lib.

Comments

Carlos O'Donell March 5, 2015, 8:24 p.m. UTC | #1
On 03/04/2015 05:19 PM, Roland McGrath wrote:
> Missed the ones in elf/ that don't actually link with -lstdc++ but need
> C++ headers that will also be missing when libstdc++ is missing.
> 
> 
> Thanks,
> Roland
> 
> 	* elf/Makefile (tests, modules-names): Likewise for tst-unique3,
> 	tst-unique3lib, tst-unique3lib2, tst-unique4, and tst-unique4lib.
> 
> --- a/elf/Makefile
> +++ b/elf/Makefile
> @@ -144,7 +144,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
>  	 unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
>  	 tst-audit1 tst-audit2 tst-audit8 tst-audit9 \
>  	 tst-stackguard1 tst-addr1 tst-thrlock \
> -	 tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
> +	 tst-unique1 tst-unique2 $(if $(CXX),tst-unique3 tst-unique4) \
>  	 tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \
>  	 tst-ptrguard1
>  #	 reldep9
> @@ -205,8 +205,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
>  		tst-unique1mod1 tst-unique1mod2 \
>  		tst-unique2mod1 tst-unique2mod2 \
>  		tst-auditmod9a tst-auditmod9b \
> -		tst-unique3lib tst-unique3lib2 \
> -		tst-unique4lib \
> +		$(if $(CXX),tst-unique3lib tst-unique3lib2 tst-unique4lib) \
>  		tst-initordera1 tst-initorderb1 \
>  		tst-initordera2 tst-initorderb2 \
>  		tst-initordera3 tst-initordera4 \
> 

Simlarly don't like. Would rather see the tests fail instead of
being elided. Thus `make check` executing to completion, and
representing the reality of your testing.

Cheers,
Carlos.
Andreas Schwab March 6, 2015, 8:57 a.m. UTC | #2
"Carlos O'Donell" <carlos@redhat.com> writes:

> Simlarly don't like. Would rather see the tests fail instead of
> being elided. Thus `make check` executing to completion, and
> representing the reality of your testing.

That won't work.  A build failure stops the summary from appearing.

Andreas.
Carlos O'Donell March 6, 2015, 3:28 p.m. UTC | #3
On 03/06/2015 03:57 AM, Andreas Schwab wrote:
> "Carlos O'Donell" <carlos@redhat.com> writes:
> 
>> Simlarly don't like. Would rather see the tests fail instead of
>> being elided. Thus `make check` executing to completion, and
>> representing the reality of your testing.
> 
> That won't work.  A build failure stops the summary from appearing.

Then you have to add dummy targets to make it build when C++ is not present.

Cheers,
Carlos.

Patch
diff mbox

--- a/elf/Makefile
+++ b/elf/Makefile
@@ -144,7 +144,7 @@  tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
 	 unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
 	 tst-audit1 tst-audit2 tst-audit8 tst-audit9 \
 	 tst-stackguard1 tst-addr1 tst-thrlock \
-	 tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
+	 tst-unique1 tst-unique2 $(if $(CXX),tst-unique3 tst-unique4) \
 	 tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \
 	 tst-ptrguard1
 #	 reldep9
@@ -205,8 +205,7 @@  modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		tst-unique1mod1 tst-unique1mod2 \
 		tst-unique2mod1 tst-unique2mod2 \
 		tst-auditmod9a tst-auditmod9b \
-		tst-unique3lib tst-unique3lib2 \
-		tst-unique4lib \
+		$(if $(CXX),tst-unique3lib tst-unique3lib2 tst-unique4lib) \
 		tst-initordera1 tst-initorderb1 \
 		tst-initordera2 tst-initorderb2 \
 		tst-initordera3 tst-initordera4 \