diff options
| author | Roland McGrath <roland@hack.frob.com> | 2015-03-04 14:11:39 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2015-03-04 14:11:39 -0800 |
| commit | e27176eea8aa74400204be4d3400e9723169fcaf (patch) | |
| tree | 94a330a05cecb89379e613468554b84de6bda695 | |
| parent | e4693aa7c1777e6849b7bbb5fc9061e883bd58fd (diff) | |
| download | glibc-e27176eea8aa74400204be4d3400e9723169fcaf.tar.gz glibc-e27176eea8aa74400204be4d3400e9723169fcaf.tar.xz glibc-e27176eea8aa74400204be4d3400e9723169fcaf.zip | |
Avoid more C++ tests.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | elf/Makefile | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index d9a53b43bb..52e46c4450 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ (tests, tests-static): Likewise for tst-cancel24-static. * debug/Makefile (tests): Likewise for tst-chk4, tst-chk5, tst-chk6, tst-lfschk4, tst-lfschk5, and tst-lfschk6. + * elf/Makefile (tests, modules-names): Likewise for tst-unique3, + tst-unique3lib, tst-unique3lib2, tst-unique4, and tst-unique4lib. 2015-03-04 Andreas Schwab <schwab@suse.de> diff --git a/elf/Makefile b/elf/Makefile index 711beedf92..c8af5ba2c9 100644 --- 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 \ |