about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2009-11-14 10:42:02 +0100
committerAndreas Schwab <schwab@linux-m68k.org>2012-04-28 22:16:37 +0200
commit6d5c57fabd1a97b110b00e59fd52f50ce5bbb1a3 (patch)
tree7fda8d19a4f6e98348aa11d6315c5d964ebfe438
parent48df16de98392ca11a1361142b2366ccefa1c81c (diff)
downloadglibc-6d5c57fabd1a97b110b00e59fd52f50ce5bbb1a3.tar.gz
glibc-6d5c57fabd1a97b110b00e59fd52f50ce5bbb1a3.tar.xz
glibc-6d5c57fabd1a97b110b00e59fd52f50ce5bbb1a3.zip
Don't run tests when cross-compiling
-rw-r--r--ChangeLog5
-rw-r--r--elf/Makefile4
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/Makefile4
4 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 677bf37363..931510b322 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* elf/Makefile ($(objpfx)tst-leaks1-mem, $(objpfx)noload-mem)
+	($(objpfx)tst-unused-dep.out): Don't run when cross-compiling.
+
 2012-04-28  Joseph Myers  <joseph@codesourcery.com>
 
 	* conform/conformtest.pl: Remove duplicate typed-constant
diff --git a/elf/Makefile b/elf/Makefile
index fd766c58c5..32d113ea30 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -156,7 +156,9 @@ tests += tst-audit6 tst-audit7
 endif
 endif
 endif
+ifeq ($(cross-compiling),no)
 tests: $(objpfx)tst-leaks1-mem $(objpfx)noload-mem
+endif
 tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
 tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
 tlsmod17a-modules = $(addprefix tst-tlsmod17a, $(tlsmod17a-suffixes))
@@ -1119,7 +1121,9 @@ $(objpfx)tst-relsort1mod2.so: $(libm)
 $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
 			   $(objpfx)tst-relsort1mod2.so
 
+ifeq ($(cross-compiling),no)
 tests: $(objpfx)tst-unused-dep.out
+endif
 
 $(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so
 	LD_TRACE_LOADED_OBJECTS=1 \
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 194dcc39a3..def7f2c3ac 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* Makefile ($(objpfx)tst-stack3-mem, $(objpfx)tst-tls6.out): Don't
+	run when cross-compiling.
+
 2012-04-26  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* sysdeps/pthread/unwind-forcedunwind.c: Include gnu/lib-names.h
diff --git a/nptl/Makefile b/nptl/Makefile
index 52277dd843..09acd8a481 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -438,7 +438,9 @@ LDFLAGS-tst-atfork2 = -rdynamic
 tst-atfork2-ENV = MALLOC_TRACE=$(objpfx)tst-atfork2.mtrace
 $(objpfx)tst-atfork2mod.so: $(shared-thread-library)
 
+ifeq ($(cross-compiling),no)
 tests: $(objpfx)tst-stack3-mem
+endif
 tst-stack3-ENV = MALLOC_TRACE=$(objpfx)tst-stack3.mtrace
 $(objpfx)tst-stack3-mem: $(objpfx)tst-stack3.out
 	$(common-objpfx)malloc/mtrace $(objpfx)tst-stack3.mtrace > $@
@@ -459,7 +461,9 @@ $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library)
 LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so
 
 ifeq ($(build-shared),yes)
+ifeq ($(cross-compiling),no)
 tests: $(objpfx)tst-tls6.out
+endif
 $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \
 		       $(objpfx)tst-tls5moda.so $(objpfx)tst-tls5modb.so \
 		       $(objpfx)tst-tls5modc.so $(objpfx)tst-tls5modd.so \