bug 482776, JarMaker.py unittests don't cause "make check" to fail, r=ted

This commit is contained in:
Axel Hecht 2009-03-31 16:25:51 +02:00
Родитель 787aa56d87
Коммит 6c14b9f30b
1 изменённых файлов: 6 добавлений и 4 удалений

Просмотреть файл

@ -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