[PATCH v2 git] debian/rules: ignore test suite failures on ia64
Even git versions that previously passed the test suite no longer
pass the test suite on merulo or mundy (text files are detected
to be binary, causing many tests using git diff to break).
Probably some basic component like libc or the kernel is broken.
Holding back the updated git binaries doesn’t do anyone any good,
so let’s ignore the result of the test suite for now.
Works-around: http://bugs.debian.org/563882
Reported-by: Anders Kaseorg <andersk@MIT.EDU>
Investigated-by: Andreas Metzler <ametzler@downhill.at.eu.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
> + : 'ignoring test suite failures (see Bug#563882)'
> + @set -e; \
> + cd t; for i in t[0-9][0-9][0-9][0-9]-*.sh; do \
> + sh $$i --verbose || :; \
> + done
> + DESTDIR='$(GIT)'-core $(MAKE) -C t/ aggregate-results-and-cleanup \
> + CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS)
That didn’t behave as advertised. Here’s a replacement.
Sorry for the noise,
Jonathan
debian/rules | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/debian/rules b/debian/rules
index ba6421e..f9a88ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,10 @@ endif
ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
TEST =
endif
+# work around #563882
+ifeq (ia64,$(ARCH))
+ TEST =
+endif
TMP =$(shell pwd)/tmp
GIT =$(shell pwd)/debian/git
@@ -49,6 +53,17 @@ build-arch-stamp: patch-stamp build-indep-stamp
CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) || \
GIT_TEST_OPTS=--verbose DESTDIR='$(GIT)'-core $(MAKE) $(TEST) \
CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS)
+ifeq (ia64,$(ARCH))
+ : 'ignoring test suite failures (see Bug#563882)'
+ @set -e; \
+ cd t; for i in t[0-9][0-9][0-9][0-9]-*.sh; do \
+ sh $$i --verbose || :; \
+ done
+ DESTDIR='$(GIT)'-core $(MAKE) -C t/ aggregate-results \
+ CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS)
+ DESTDIR='$(GIT)'-core $(MAKE) -C t/ clean \
+ CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS)
+endif
touch build-arch-stamp
build-indep-stamp:
$(MAKE) -CDocumentation man html ASCIIDOC8=YesPlease ASCIIDOC_NO_ROFF=Yes
--
1.6.6
Reply to: