[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH git] ignore test suite failures on ia64 (was Bug#563882: git-core FTBFS on ia64: t1001-read-tree-m-2way.sh test fails)

Subject: 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 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>
Andreas Metzler wrote:

> FWIW all versions of git-diff I tried (1.6.6, 1.6.5, and
> report "Binary files a/M.out and b/4.out differ".

Thanks for checking this.  So Anders’s suggestion is right: we
should disable the test suite on ia64 for now.

How about this patch?

 debian/rules |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/debian/rules b/debian/rules
index ba6421e..38691ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,10 @@ endif
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
   TEST =
+# work around #563882
+ifeq (ia64,$(ARCH))
+  TEST =
 TMP =$(shell pwd)/tmp
 GIT =$(shell pwd)/debian/git
@@ -49,6 +53,15 @@ 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-and-cleanup \
+	  CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS)
 	touch build-arch-stamp
 	$(MAKE) -CDocumentation man html ASCIIDOC8=YesPlease ASCIIDOC_NO_ROFF=Yes

Reply to: