From fd81e454339de50931594bd150857eb88a516a98 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Mon, 29 Jan 2018 15:25:39 +0100 Subject: Turn on several threads when creating xz/lzma tarballs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and not using pristine-tar. Gives a 50% speedup on my machine: $ time gbp export-orig --no-pristine-tar --force-create gbp:info: Creating thunderbird_52.6.0.orig.tar.xz from 'upstream/52.6.0' gbp:info: Creating additional tarball 'thunderbird_52.6.0.orig-thunderbird-l10n.tar.xz' from 'dea43c2b49f11d68f05edac2bd9d6c5d1e1f4bcb' gbp:info: Creating additional tarball 'thunderbird_52.6.0.orig-lightning-l10n.tar.xz' from '9adcd261726ccb160c4fd6947f7cbfe9df2e581b' real 8m27,153s user 7m23,717s sys 0m3,015s 0|agx@bogon:/var/scratch/debian/icedove/icedove (debian/wheezy)$ time gbp-from-sourcetree export-orig --no-pristine-tar --force-create gbp:info: Creating thunderbird_52.6.0.orig.tar.xz from 'upstream/52.6.0' gbp:info: Creating additional tarball 'thunderbird_52.6.0.orig-thunderbird-l10n.tar.xz' from 'dea43c2b49f11d68f05edac2bd9d6c5d1e1f4bcb' gbp:info: Creating additional tarball 'thunderbird_52.6.0.orig-lightning-l10n.tar.xz' from '9adcd261726ccb160c4fd6947f7cbfe9df2e581b' real 4m3,080s user 11m18,733s sys 0m3,499s Thanks: Carsten Schönert for the suggestion Closes: #888572 --- tests/component/deb/test_export_orig.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/component/deb/test_export_orig.py b/tests/component/deb/test_export_orig.py index e42a1fc2..e3d69571 100644 --- a/tests/component/deb/test_export_orig.py +++ b/tests/component/deb/test_export_orig.py @@ -44,16 +44,19 @@ class TestExportOrig(ComponentTestBase): tarballs = ["../%s_2.8.orig-foo.tar.gz" % pkg, "../%s_2.8.orig.tar.gz" % pkg] - assert import_dsc(['arg0', '--no-pristine-tar', dsc]) == 0 + assert import_dsc(['arg0', '--no-pristine-tar', '--verbose', dsc]) == 0 repo = ComponentTestGitRepository(pkg) os.chdir(pkg) assert_false(repo.has_branch('pristine-tar'), "Pristine-tar branch must not exist") for t in tarballs: self.assertFalse(os.path.exists(t), "Tarball %s must not exist" % t) ret = export_orig(['arg0', + '--verbose', '--component=foo', '--no-pristine-tar']) ok_(ret == 0, "Exporting tarballs failed") + self._check_in_info_log(".*Building upstream tarball with compression " + "") for t in tarballs: self.assertTrue(os.path.exists(t), "Tarball %s not found" % t) -- cgit v1.2.3