From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 240B1138247 for ; Wed, 27 Nov 2013 23:32:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0310BE095A; Wed, 27 Nov 2013 23:32:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DC41E0946 for ; Wed, 27 Nov 2013 23:32:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19E6A33F30D for ; Wed, 27 Nov 2013 23:32:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C2BB0D0317 for ; Wed, 27 Nov 2013 23:32:00 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1385594828.9cf5cf2220ee1a5de7575441a0b817b948ca5aa9.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 9cf5cf2220ee1a5de7575441a0b817b948ca5aa9 X-VCS-Branch: master Date: Wed, 27 Nov 2013 23:32:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 11311ada-ca55-48b4-929c-64349cde7c88 X-Archives-Hash: 8f43ecbb9d985c4c85b41979807682fd commit: 9cf5cf2220ee1a5de7575441a0b817b948ca5aa9 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Wed Nov 27 22:39:11 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Wed Nov 27 23:27:08 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9cf5cf22 net-libs/webkit-gtk: do not build unittests unless needed --- .../files/webkit-gtk-1.8.1-tests-xvfb.patch | 32 --------------- .../files/webkit-gtk-2.2.2-unittests-build.patch | 45 ++++++++++++++++++++++ net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild | 3 ++ 3 files changed, 48 insertions(+), 32 deletions(-) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch deleted file mode 100644 index e310c65..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch +++ /dev/null @@ -1,32 +0,0 @@ -Rely on virtualx.eclass instead of manually spawning Xvfb. Fixes occasional -test failures. - ---- a/Tools/Scripts/run-gtk-tests -+++ b/Tools/Scripts/run-gtk-tests -@@ -147,18 +147,9 @@ - - def _setup_testing_environment(self): - self._test_env = os.environ -- self._test_env["DISPLAY"] = self._options.display - self._test_env["WEBKIT_INSPECTOR_PATH"] = os.path.abspath(os.path.join(self._programs_path, 'resources', 'inspector')) - self._test_env['GSETTINGS_BACKEND'] = 'memory' - -- try: -- self._xvfb = self._create_process(["Xvfb", self._options.display, "-screen", "0", "800x600x24", "-nolisten", "tcp"], -- stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- except Exception as e: -- sys.stderr.write("Failed to run Xvfb: %s\n", e) -- sys.stderr.flush() -- return False -- - # If we cannot start the accessibility daemons, we can just skip the accessibility tests. - if not self._start_accessibility_daemons(): - print "Could not start accessibility bus, so skipping TestWebKitAccessibility" -@@ -170,7 +161,6 @@ - self._spi_registryd.terminate() - if self._spi_bus_launcher: - self._spi_bus_launcher.terminate() -- self._xvfb.kill(); - - def _remove_skipped_tests(self): - tests_to_remove = [] diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch new file mode 100644 index 0000000..14fa30f --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch @@ -0,0 +1,45 @@ +From: Gilles Dartiguelongue +Date: Wed, 27 Nov 2013 23:36:41 +0100 +Subject: [PATCH] Build unittests on demand + +--- a/GNUmakefile.am 2013-11-27 23:52:56.148735433 +0100 ++++ b/GNUmakefile.am 2013-11-27 23:51:25.551590806 +0100 +@@ -51,6 +51,7 @@ + # Libraries and support components + bin_PROGRAMS := + noinst_PROGRAMS := ++check_PROGRAMS := + libexec_PROGRAMS := + noinst_DATA := + noinst_HEADERS := +--- a/Source/WebKit/gtk/GNUmakefile.am ++++ b/Source/WebKit/gtk/GNUmakefile.am +@@ -446,7 +446,7 @@ webkit_tests_ldflags = \ + -no-fast-install + + if ENABLE_WEBKIT1 +-noinst_PROGRAMS += \ ++check_PROGRAMS += \ + Programs/unittests/testapplicationcache \ + Programs/unittests/testcontextmenu \ + Programs/unittests/testdomdocument \ +--- a/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am ++++ b/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am +@@ -25,12 +25,12 @@ TEST_PROGS += \ + Programs/WebKit2APITests/TestWebKitWebViewGroup \ + Programs/WebKit2APITests/TestWebViewEditor + +-noinst_PROGRAMS += $(TEST_PROGS) ++check_PROGRAMS += $(TEST_PROGS) + + if HAVE_ATSPI2 + TEST_PROGS += Programs/WebKit2APITests/TestWebKitAccessibility + +-noinst_PROGRAMS += Programs/WebKit2APITests/AccessibilityTestServer ++check_PROGRAMS += Programs/WebKit2APITests/AccessibilityTestServer + endif + + webkit2_tests_cppflags = \ +-- +1.8.3.2 + diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild index 7e1b36d..6afe3a6 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild @@ -178,6 +178,9 @@ src_prepare() { # bug #459978, upstream bug #113397 epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch" + # Do not build unittests unless requested + epatch "${FILESDIR}"/${PN}-2.2.2-unittests-build.patch + # Prevent maintainer mode from being triggered during make AT_M4DIR=Source/autotools eautoreconf }