From f2863dce724f813bd16882caaaed2b8a1689796b Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Wed, 23 May 2012 16:51:21 +0200 Subject: [PATCH] Bug 757397 - Make test package generation quieter; r=ted This may reduce the size of the buildbot build logs by up to half! --HG-- extra : rebase_source : 87b3f2f40654d69ecd91e19520e2341fc8aac9a6 --- config/config.mk | 3 +++ js/src/config/config.mk | 3 +++ js/src/tests/Makefile.in | 2 +- layout/tools/reftest/Makefile.in | 4 ++-- testing/mochitest/Makefile.in | 6 +++--- testing/testsuite-targets.mk | 4 ++-- testing/xpcshell/Makefile.in | 2 +- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/config/config.mk b/config/config.mk index 6fa8b1ef07e..ba329deb0d5 100644 --- a/config/config.mk +++ b/config/config.mk @@ -340,13 +340,16 @@ MAKE_JARS_FLAGS += --both-manifests endif TAR_CREATE_FLAGS = -cvhf +TAR_CREATE_FLAGS_QUIET = -chf ifeq ($(OS_ARCH),BSD_OS) TAR_CREATE_FLAGS = -cvLf +TAR_CREATE_FLAGS_QUIET = -cLf endif ifeq ($(OS_ARCH),OS2) TAR_CREATE_FLAGS = -cvf +TAR_CREATE_FLAGS_QUIET = -cf endif # diff --git a/js/src/config/config.mk b/js/src/config/config.mk index 6fa8b1ef07e..ba329deb0d5 100644 --- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -340,13 +340,16 @@ MAKE_JARS_FLAGS += --both-manifests endif TAR_CREATE_FLAGS = -cvhf +TAR_CREATE_FLAGS_QUIET = -chf ifeq ($(OS_ARCH),BSD_OS) TAR_CREATE_FLAGS = -cvLf +TAR_CREATE_FLAGS_QUIET = -cLf endif ifeq ($(OS_ARCH),OS2) TAR_CREATE_FLAGS = -cvf +TAR_CREATE_FLAGS_QUIET = -cf endif # diff --git a/js/src/tests/Makefile.in b/js/src/tests/Makefile.in index 0e45a370c96..c3dd2707322 100644 --- a/js/src/tests/Makefile.in +++ b/js/src/tests/Makefile.in @@ -45,6 +45,6 @@ PKG_STAGE = $(DIST)/test-package-stage # stage tests for packaging stage-package: $(NSINSTALL) -D $(PKG_STAGE)/jsreftest/tests - @(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_FILES)) | (cd $(PKG_STAGE)/jsreftest/tests && tar -xf -) + (cd $(srcdir) && tar $(TAR_CREATE_FLAGS_QUIET) - $(TEST_FILES)) | (cd $(PKG_STAGE)/jsreftest/tests && tar -xf -) $(srcdir)/jstests.py --make-manifests $(PKG_STAGE)/jsreftest/tests/ diff --git a/layout/tools/reftest/Makefile.in b/layout/tools/reftest/Makefile.in index fc758218004..df30510d51c 100644 --- a/layout/tools/reftest/Makefile.in +++ b/layout/tools/reftest/Makefile.in @@ -77,10 +77,10 @@ PKG_STAGE = $(DIST)/test-package-stage # stage harness and tests for packaging stage-package: $(NSINSTALL) -D $(PKG_STAGE)/reftest && $(NSINSTALL) -D $(PKG_STAGE)/reftest/tests - @(cd $(DEPTH)/_tests/reftest/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/reftest && tar -xf -) + (cd $(DEPTH)/_tests/reftest/ && tar $(TAR_CREATE_FLAGS_QUIET) - *) | (cd $(PKG_STAGE)/reftest && tar -xf -) $(PYTHON) $(topsrcdir)/layout/tools/reftest/print-manifest-dirs.py \ $(topsrcdir) \ $(topsrcdir)/layout/reftests/reftest.list \ $(topsrcdir)/testing/crashtest/crashtests.list \ - | (cd $(topsrcdir) && xargs tar $(TAR_CREATE_FLAGS) -) \ + | (cd $(topsrcdir) && xargs tar $(TAR_CREATE_FLAGS_QUIET) -) \ | (cd $(PKG_STAGE)/reftest/tests && tar -xf -) diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in index c3f2d975979..50a0c41d3f1 100644 --- a/testing/mochitest/Makefile.in +++ b/testing/mochitest/Makefile.in @@ -186,7 +186,7 @@ stage-chromejar: ifdef ACCESSIBILITY cp -RL $(DEPTH)/_tests/testing/mochitest/a11y $(PKG_CHROMEJAR) endif - @(cd $(PKG_STAGE)/mochitest && zip -r tests.jar content/) + (cd $(PKG_STAGE)/mochitest && zip -rq tests.jar content/) @(rm -rf $(PKG_CHROMEJAR)) stage-package: stage-chromejar @@ -197,8 +197,8 @@ $(_DEST_DIR): stage-package: $(NSINSTALL) -D $(PKG_STAGE)/mochitest && $(NSINSTALL) -D $(PKG_STAGE)/bin/plugins - @(cd $(DEPTH)/_tests/testing/mochitest/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mochitest && tar -xf -) + (cd $(DEPTH)/_tests/testing/mochitest/ && tar $(TAR_CREATE_FLAGS_QUIET) - *) | (cd $(PKG_STAGE)/mochitest && tar -xf -) @(cd $(DIST_BIN) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_BINS)) | (cd $(PKG_STAGE)/bin && tar -xf -) @(cd $(DIST_BIN)/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -) - @(cd $(topsrcdir)/build/pgo/certs && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/certs && tar -xf -) + (cd $(topsrcdir)/build/pgo/certs && tar $(TAR_CREATE_FLAGS_QUIET) - *) | (cd $(PKG_STAGE)/certs && tar -xf -) @(cd $(DIST_BIN)/plugins && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_PLUGINS)) | (cd $(PKG_STAGE)/bin/plugins && tar -xf -) diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index df86e82a9a5..4ee29021985 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -285,7 +285,7 @@ else $(MAKE) -C $(DEPTH)/testing/mochitest stage-chromejar PKG_STAGE=$(DIST)/universal endif cd $(PKG_STAGE) && \ - zip -r9D "$(call core_abspath,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE))" * + zip -rq9D "$(call core_abspath,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE))" * ifeq (Android, $(OS_TARGET)) package-tests: stage-android @@ -334,7 +334,7 @@ stage-tps: make-stage-dir $(NSINSTALL) -D $(PKG_STAGE)/tps/tests @(cd $(topsrcdir)/testing/tps && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tps && tar -xf -) @(cd $(topsrcdir)/services/sync/tps && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tps && tar -xf -) - @(cd $(topsrcdir)/services/sync/tests/tps && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tps/tests && tar -xf -) + (cd $(topsrcdir)/services/sync/tests/tps && tar $(TAR_CREATE_FLAGS_QUIET) - *) | (cd $(PKG_STAGE)/tps/tests && tar -xf -) stage-mozbase: make-stage-dir $(MAKE) -C $(DEPTH)/testing/mozbase stage-package diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in index 9355f7af4dd..06412dbed2e 100644 --- a/testing/xpcshell/Makefile.in +++ b/testing/xpcshell/Makefile.in @@ -67,5 +67,5 @@ stage-package: @(cd $(topsrcdir)/build && tar $(TAR_CREATE_FLAGS) - $(EXTRA_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -) @cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/xpcshell @(cd $(topsrcdir)/build/mobile && tar $(TAR_CREATE_FLAGS) - $(MOBILE_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -) - @(cd $(DEPTH)/_tests/xpcshell/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/xpcshell/tests && tar -xf -) + (cd $(DEPTH)/_tests/xpcshell/ && tar $(TAR_CREATE_FLAGS_QUIET) - *) | (cd $(PKG_STAGE)/xpcshell/tests && tar -xf -) @(cd $(DIST)/bin/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)