Restrict run-conformtest runs

diff --git a/ChangeLog b/ChangeLog
index a67840a21673a77fef3c11bb6a19a952c0dac9d2..130ea8276a18648b7aec49cca78b2ba065c8fd11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-26  Ulrich Drepper  <drepper@gmail.com>
 
+       * conform/Makefile (tests): Run only when not cross-compiling and
+       when fast-check is not defined.
+
        * conform/conformtest.pl: XPG7 and POSIX2008 require C99.
        * conform/data/limits.h-data: Fixes for POSIX2008.
        * conform/run-conformtest.sh: Run all tests.

diff --git a/conform/Makefile b/conform/Makefile
index d7d939ea61339205c1ff4975daf961e5a8660624..f1f45ee2015108a997e24784725e15b142bc3924 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -25,7 +25,11 @@ distribute = conformtest.pl $(wildcard data/*.h-data) \
 
 include ../Rules
 
+ifneq (yes,$(fast-check))
+ifeq (no,$(cross-compiling))
 tests: $(objpfx)run-conformtest.out
+endif
+endif
 
 $(objpfx)run-conformtest.out: run-conformtest.sh conformtest.pl \
                              $(wildcard data/*.h-data) \