This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED] [PATCH] Avoid C++ tests when the C++ cannot be linked
- From: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Tue, 14 Jul 2015 11:21:07 -0300
- Subject: [COMMITTED] [PATCH] Avoid C++ tests when the C++ cannot be linked
- Authentication-results: sourceware.org; auth=none
* elf/Makefile [ifeq (yes,$(build-shared)) (tests)] (tst-nodelete):
Add iff $CXX is set.
[ifeq (yes,$(build-shared)) (modules-names)] (tst-nodelete-rtldmod):
Likewise.
(tst-nodelete-zmodiff): Likewise.
* nptl/Makefile [[ifeq (,$(CXX))] (tests-unsupported)]: Add tst-once5.
--
diff --git a/elf/Makefile b/elf/Makefile
index 535421f..90d5058 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -132,7 +132,7 @@ tests += $(tests-static)
ifeq (yes,$(build-shared))
tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
constload1 order noload filter unload \
- reldep reldep2 reldep3 reldep4 nodelete nodelete2 tst-nodelete \
+ reldep reldep2 reldep3 reldep4 nodelete nodelete2 \
nodlopen nodlopen2 neededtest neededtest2 \
neededtest3 neededtest4 unload2 lateglobal initfirst global \
restest2 next dblload dblunload reldep5 reldep6 reldep7 reldep8 \
@@ -145,7 +145,8 @@ 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 $(if $(CXX),tst-unique3 tst-unique4) \
+ tst-unique1 tst-unique2 $(if $(CXX),tst-unique3 tst-unique4 \
+ tst-nodelete) \
tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \
tst-ptrguard1 tst-tlsalign tst-tlsalign-extern
# reldep9
@@ -208,8 +209,8 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
tst-unique2mod1 tst-unique2mod2 \
tst-auditmod9a tst-auditmod9b \
$(if $(CXX),tst-unique3lib tst-unique3lib2 tst-unique4lib \
- tst-nodelete-uniquemod) \
- tst-nodelete-rtldmod tst-nodelete-zmod \
+ tst-nodelete-uniquemod tst-nodelete-rtldmod \
+ tst-nodelete-zmod) \
tst-initordera1 tst-initorderb1 \
tst-initordera2 tst-initorderb2 \
tst-initordera3 tst-initordera4 \
diff --git a/nptl/Makefile b/nptl/Makefile
index 5bc4ad1..140f063 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -400,7 +400,7 @@ endif
ifeq (,$(CXX))
# These tests require a C++ compiler and runtime.
-tests-unsupported += tst-cancel24 tst-cancel24-static
+tests-unsupported += tst-cancel24 tst-cancel24-static tst-once5
endif
include ../Rules