diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-11-04 21:28:03 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-11-04 21:28:03 +0000 |
| commit | 5e37a69a04c61d5bdffb2acbcb05362794e72816 (patch) | |
| tree | 3ca089e3c4c794f8d66e0007bf175ae573ab4691 | |
| parent | 6d1774146f8e512de0cf3b05cca7c0d9205b4e5b (diff) | |
| download | glibc-5e37a69a04c61d5bdffb2acbcb05362794e72816.tar.gz glibc-5e37a69a04c61d5bdffb2acbcb05362794e72816.tar.xz glibc-5e37a69a04c61d5bdffb2acbcb05362794e72816.zip | |
Handle tests-unsupported if run-built-tests = no.
The tests-unsupported variable lists tests that should neither be compiled nor run, because some support needed to compile them is missing. The implementation of this feature involves having a rule to create .out files for these tests that takes precedence over the default rule. This does not work in the run-built-tests = no case (cross compiling without use of a wrapper to run the tests on a separate system, in which cases most tests are compiled only) because in that case the tests target depends on $(tests) to ensure all tests get compiled. This patch changes that dependency to filter out $(tests-unsupported). Tested with cross-compilation to ARM with GCC 5, where libstdc++ is missing some C++11 support because of the bug I fixed in <https://gcc.gnu.org/ml/gcc-patches/2015-10/msg01040.html> and so tests-unsupported is nonempty and the tests in question fail to compile. (When I originally observed the bug, it was with a native build / test simply using an x86_64 compiler that had been configured as a cross compiler to isolate it from the system headers / libraries, so the configuration issue applied to the compiler but run-built-tests was yes, so I don't observe the issue with tests-unsupported with that compiler.) * Rules [$(run-built-tests) = no] (tests): Do not depend on $(tests-unsupported).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Rules | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 27ebce73bb..0d3f7781fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-11-04 Joseph Myers <joseph@codesourcery.com> + + * Rules [$(run-built-tests) = no] (tests): Do not depend on + $(tests-unsupported). + 2016-11-04 Adhemerval Zanella <adhemerval.zanella@linaro.org> * sysdeps/unix/sysv/linux/sparc/bits/wordsize.h diff --git a/Rules b/Rules index 342d659408..4b95997a06 100644 --- a/Rules +++ b/Rules @@ -114,7 +114,8 @@ else others: $(addprefix $(objpfx),$(extra-objs)) endif ifeq ($(run-built-tests),no) -tests: $(addprefix $(objpfx),$(tests) $(test-srcs)) $(tests-special) +tests: $(addprefix $(objpfx),$(filter-out $(tests-unsupported),$(tests)) \ + $(test-srcs)) $(tests-special) xtests: tests $(xtests-special) else tests: $(tests:%=$(objpfx)%.out) $(tests-special) |