diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-12-30 13:01:44 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-12-30 13:01:44 +0000 |
| commit | ef83c83a257226d470a939434c7193e2a1fd4f82 (patch) | |
| tree | 354cecfac437f9bd58d8ee8db698aabff07b208b | |
| parent | d2d43afa113eb143303a3d4c1e31194648077642 (diff) | |
| download | glibc-ef83c83a257226d470a939434c7193e2a1fd4f82.tar.gz glibc-ef83c83a257226d470a939434c7193e2a1fd4f82.tar.xz glibc-ef83c83a257226d470a939434c7193e2a1fd4f82.zip | |
Fix tst-support_record_failure-2 for run-built-tests = no.
The support/tst-support_record_failure-2.out test attempts to run built code even if run-built-tests = no, so failing with build-many-glibcs.py for all architectures whose code cannot be run on the system running the script. This patch disables the test in that case. Tested for x86_64 (native), and for aarch64 with build-many-glibcs.py. * support/Makefile (tests-special): Make definition conditional on [$(run-built-tests) = yes]. ($(objpfx)tst-support_record_failure-2.out): Make rule conditional on [$(run-built-tests) = yes].
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | support/Makefile | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index f188d884ba..ad20821e7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-12-30 Joseph Myers <joseph@codesourcery.com> + + * support/Makefile (tests-special): Make definition conditional on + [$(run-built-tests) = yes]. + ($(objpfx)tst-support_record_failure-2.out): Make rule conditional + on [$(run-built-tests) = yes]. + 2016-12-30 Siddhesh Poyarekar <siddhesh@sourceware.org> * Rules (tests): Add tests-printers-programs to tests to be diff --git a/support/Makefile b/support/Makefile index 1bde8bd740..4e9d42ef09 100644 --- a/support/Makefile +++ b/support/Makefile @@ -67,6 +67,7 @@ tests = \ README-testing \ tst-support_record_failure \ +ifeq ($(run-built-tests),yes) tests-special = \ $(objpfx)tst-support_record_failure-2.out @@ -76,5 +77,6 @@ $(objpfx)tst-support_record_failure-2.out: tst-support_record_failure-2.sh \ '$(run-program-env)' '$(test-program-prefix-after-env)' \ > $@; \ $(evaluate-test) +endif include ../Rules |