blob: c0cd85a8375ad0c50196aed93f33c1e0849cba54 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
# DP: For biarch builds, disable the testsuite for the non-default architecture
# DP: for runtime libraries, which are not built by default (libjava).
---
libjava/testsuite/Makefile.in | 4 +++-
2 files changed, 25 insertions(+), 1 deletions(-)
Index: b/src/libjava/testsuite/Makefile.in
===================================================================
--- a/src/libjava/testsuite/Makefile.in
+++ b/src/libjava/testsuite/Makefile.in
@@ -384,12 +384,14 @@
check-DEJAGNU: site.exp
+ runtestflags="`echo '$(RUNTESTFLAGS)' | sed -r 's/,-m(32|64|x32)//g;s/,-mabi=(n32|64)//g'`"; \
+ case "$$runtestflags" in *\\{\\}) runtestflags=; esac; \
srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
EXPECT=$(EXPECT); export EXPECT; \
runtest=$(RUNTEST); \
if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \
- if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
+ if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $$runtestflags; \
then :; else exit_status=1; fi; \
done; \
else echo "WARNING: could not find \`runtest'" 1>&2; :;\
|
