about summary refs log tree commit diff
path: root/conform/Makefile
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-03-17 01:21:10 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-03-17 01:21:10 +0000
commitc33eac51f4a8aa6a7ea77cccf6bea3f417eaff6d (patch)
tree96868af3f817ec48e35119387dcb0984af16e630 /conform/Makefile
parent33c02810c5fdc06deddbf0b1bfd78969da9ec739 (diff)
downloadglibc-c33eac51f4a8aa6a7ea77cccf6bea3f417eaff6d.tar.gz
glibc-c33eac51f4a8aa6a7ea77cccf6bea3f417eaff6d.tar.xz
glibc-c33eac51f4a8aa6a7ea77cccf6bea3f417eaff6d.zip
conformtest: Skip execution tests when cross-compiling.
This patch makes conformtest skip execution tests when
cross-compiling, as an interim step towards running most of these
tests (presently disabled) in that case.  It omits the (obvious)
Makefile change to actually enable the conformtest tests when
cross-compiling, as there are still enough failures seen with
build-many-glibcs.py that I'd like to get the results cleaner before
enabling these tests.

Tested for x86_64, and with the tests actually enabled for
cross-compilation with build-many-glibcs.py.

	* conform/conformtest.pl ($cross): New variable.
	(--cross): New command-line option.
	(runtest): Skip test execution when cross-compiling.
	* conform/Makefile (conformtest-cross): New variable.
	($(conformtest-header-tests)): Pass $(conformtest-cross) to
	conformtest.pl.
Diffstat (limited to 'conform/Makefile')
-rw-r--r--conform/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/conform/Makefile b/conform/Makefile
index c07cc1d8d9..eb2288f144 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -197,13 +197,19 @@ conformtest-cc-flags = -I../include $(+sysdep-includes) $(sysincludes) -I..
 # in xfail[cond]- lines in test expectations.
 conformtest-xfail = $(if $(conformtest-xfail-conds),\
 			 --xfail='$(conformtest-xfail-conds)')
+ifeq (no,$(cross-compiling))
+conformtest-cross =
+else
+conformtest-cross = --cross
+endif
 $(conformtest-header-tests): $(objpfx)%/conform.out: \
 			     conformtest.pl $(conformtest-headers-data)
 	(set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \
 	 mkdir -p $(@D)/scratch; \
 	 $(PERL) -I. conformtest.pl --tmpdir=$(@D)/scratch --cc='$(CC)' \
 		 --flags='$(conformtest-cc-flags)' --standard=$$std \
-		 --headers=$$hdr $(conformtest-xfail) > $@); \
+		 --headers=$$hdr $(conformtest-xfail) $(conformtest-cross) \
+		 > $@); \
 	$(evaluate-test)
 
 $(linknamespace-symlists-tests): $(objpfx)symlist-%: list-header-symbols.pl