From 6c14b9f30b55c90f2a924266c8f5cebc3a86ebbf Mon Sep 17 00:00:00 2001 From: Axel Hecht Date: Tue, 31 Mar 2009 16:25:51 +0200 Subject: [PATCH] bug 482776, JarMaker.py unittests don't cause "make check" to fail, r=ted --- config/tests/src-simple/Makefile.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in index 5c33a50583d..6000bce960e 100644 --- a/config/tests/src-simple/Makefile.in +++ b/config/tests/src-simple/Makefile.in @@ -59,15 +59,17 @@ check-%:: if test -d $(FINAL_TARGET); then rm -rf $(FINAL_TARGET); fi; make realchrome MOZ_CHROME_FILE_FORMAT=$* @echo "Comparing manifests..." - @if ! sort $(MY_MANIFEST) | diff -u $(srcdir)/../$(REF_MANIFEST).$* - ; then \ - echo "FAIL: different content in manifest!" ; \ + @if ! sort $(MY_MANIFEST) | diff -U 0 $(srcdir)/../$(REF_MANIFEST).$* - ; then \ + echo "TEST-UNEXPECTED-FAIL | config/tests/$(REF_MANIFEST).$* | differing content in manifest!" ; \ + false; \ fi - @if [ $* == "jar" ]; then \ + @if [ $* = "jar" ]; then \ $(UNZIP) -d $(FINAL_TARGET)/chrome/test $(FINAL_TARGET)/chrome/test.jar; \ fi @echo "Comparing packages..." @if ! diff -ur $(srcdir)/../ref-simple $(FINAL_TARGET)/chrome/test ; then\ - echo "FAIL: different content in jar!" ; \ + echo "TEST-UNEXPECTED-FAIL | config/tests/ref-simple | different content in jar" ; \ + false; \ fi include $(topsrcdir)/config/rules.mk