packaging: add 64bit libs on 32bit build env

[platform/upstream/linaro-glibc.git] / Rules

diff --git a/Rules b/Rules
index 49ca8ea..4f9cdf3 100644 (file)
--- a/Rules
+++ b/Rules
@@ -95,13 +95,24 @@ else
 others: $(addprefix $(objpfx),$(extra-objs))
 endif
 ifeq ($(run-built-tests),no)
-tests: $(addprefix $(objpfx),$(tests) $(test-srcs))
-xtests: tests
+tests: $(addprefix $(objpfx),$(tests) $(test-srcs)) $(tests-special)
+xtests: tests $(xtests-special)
 else
-tests: $(tests:%=$(objpfx)%.out)
-xtests: tests $(xtests:%=$(objpfx)%.out)
+tests: $(tests:%=$(objpfx)%.out) $(tests-special)
+xtests: tests $(xtests:%=$(objpfx)%.out) $(xtests-special)
 endif
 
+tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
+xtests-special-notdir = $(patsubst $(objpfx)%, %, $(xtests-special))
+tests:
+       $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
+         $(sort $(tests) $(tests-special-notdir:.out=)) \
+         > $(objpfx)subdir-tests.sum
+xtests:
+       $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
+         $(sort $(xtests) $(xtests-special-notdir:.out=)) \
+         > $(objpfx)subdir-xtests.sum
+
 ifeq ($(build-programs),yes)
 binaries-all-notests = $(others) $(sysdep-others)
 binaries-all-tests = $(tests) $(xtests) $(test-srcs)
@@ -180,12 +191,14 @@ ifneq "$(strip $(tests) $(xtests) $(test-srcs))" ""
 # from the test programs and whatever input files are present.
 
 make-test-out = $(test-wrapper-env) \
-               GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
+               $(run-program-env) \
                $($*-ENV) $(host-test-program-cmd) $($*-ARGS)
 $(objpfx)%.out: %.input $(objpfx)%
-       $(make-test-out) > $@ < $(word 1,$^)
+       $(make-test-out) > $@ < $(word 1,$^); \
+       $(evaluate-test)
 $(objpfx)%.out: /dev/null $(objpfx)%   # Make it 2nd arg for canned sequence.
-       $(make-test-out) > $@
+       $(make-test-out) > $@; \
+       $(evaluate-test)
 
 endif  # tests