| 1 |
commit: 9cf5cf2220ee1a5de7575441a0b817b948ca5aa9 |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 27 22:39:11 2013 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 27 23:27:08 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9cf5cf22 |
| 7 |
|
| 8 |
net-libs/webkit-gtk: do not build unittests unless needed |
| 9 |
|
| 10 |
--- |
| 11 |
.../files/webkit-gtk-1.8.1-tests-xvfb.patch | 32 --------------- |
| 12 |
.../files/webkit-gtk-2.2.2-unittests-build.patch | 45 ++++++++++++++++++++++ |
| 13 |
net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild | 3 ++ |
| 14 |
3 files changed, 48 insertions(+), 32 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index e310c65..0000000 |
| 19 |
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.8.1-tests-xvfb.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,32 +0,0 @@ |
| 22 |
-Rely on virtualx.eclass instead of manually spawning Xvfb. Fixes occasional |
| 23 |
-test failures. |
| 24 |
- |
| 25 |
---- a/Tools/Scripts/run-gtk-tests |
| 26 |
-+++ b/Tools/Scripts/run-gtk-tests |
| 27 |
-@@ -147,18 +147,9 @@ |
| 28 |
- |
| 29 |
- def _setup_testing_environment(self): |
| 30 |
- self._test_env = os.environ |
| 31 |
-- self._test_env["DISPLAY"] = self._options.display |
| 32 |
- self._test_env["WEBKIT_INSPECTOR_PATH"] = os.path.abspath(os.path.join(self._programs_path, 'resources', 'inspector')) |
| 33 |
- self._test_env['GSETTINGS_BACKEND'] = 'memory' |
| 34 |
- |
| 35 |
-- try: |
| 36 |
-- self._xvfb = self._create_process(["Xvfb", self._options.display, "-screen", "0", "800x600x24", "-nolisten", "tcp"], |
| 37 |
-- stdout=subprocess.PIPE, stderr=subprocess.PIPE) |
| 38 |
-- except Exception as e: |
| 39 |
-- sys.stderr.write("Failed to run Xvfb: %s\n", e) |
| 40 |
-- sys.stderr.flush() |
| 41 |
-- return False |
| 42 |
-- |
| 43 |
- # If we cannot start the accessibility daemons, we can just skip the accessibility tests. |
| 44 |
- if not self._start_accessibility_daemons(): |
| 45 |
- print "Could not start accessibility bus, so skipping TestWebKitAccessibility" |
| 46 |
-@@ -170,7 +161,6 @@ |
| 47 |
- self._spi_registryd.terminate() |
| 48 |
- if self._spi_bus_launcher: |
| 49 |
- self._spi_bus_launcher.terminate() |
| 50 |
-- self._xvfb.kill(); |
| 51 |
- |
| 52 |
- def _remove_skipped_tests(self): |
| 53 |
- tests_to_remove = [] |
| 54 |
|
| 55 |
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 |
| 56 |
new file mode 100644 |
| 57 |
index 0000000..14fa30f |
| 58 |
--- /dev/null |
| 59 |
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.2-unittests-build.patch |
| 60 |
@@ -0,0 +1,45 @@ |
| 61 |
+From: Gilles Dartiguelongue <eva@g.o> |
| 62 |
+Date: Wed, 27 Nov 2013 23:36:41 +0100 |
| 63 |
+Subject: [PATCH] Build unittests on demand |
| 64 |
+ |
| 65 |
+--- a/GNUmakefile.am 2013-11-27 23:52:56.148735433 +0100 |
| 66 |
++++ b/GNUmakefile.am 2013-11-27 23:51:25.551590806 +0100 |
| 67 |
+@@ -51,6 +51,7 @@ |
| 68 |
+ # Libraries and support components |
| 69 |
+ bin_PROGRAMS := |
| 70 |
+ noinst_PROGRAMS := |
| 71 |
++check_PROGRAMS := |
| 72 |
+ libexec_PROGRAMS := |
| 73 |
+ noinst_DATA := |
| 74 |
+ noinst_HEADERS := |
| 75 |
+--- a/Source/WebKit/gtk/GNUmakefile.am |
| 76 |
++++ b/Source/WebKit/gtk/GNUmakefile.am |
| 77 |
+@@ -446,7 +446,7 @@ webkit_tests_ldflags = \ |
| 78 |
+ -no-fast-install |
| 79 |
+ |
| 80 |
+ if ENABLE_WEBKIT1 |
| 81 |
+-noinst_PROGRAMS += \ |
| 82 |
++check_PROGRAMS += \ |
| 83 |
+ Programs/unittests/testapplicationcache \ |
| 84 |
+ Programs/unittests/testcontextmenu \ |
| 85 |
+ Programs/unittests/testdomdocument \ |
| 86 |
+--- a/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am |
| 87 |
++++ b/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am |
| 88 |
+@@ -25,12 +25,12 @@ TEST_PROGS += \ |
| 89 |
+ Programs/WebKit2APITests/TestWebKitWebViewGroup \ |
| 90 |
+ Programs/WebKit2APITests/TestWebViewEditor |
| 91 |
+ |
| 92 |
+-noinst_PROGRAMS += $(TEST_PROGS) |
| 93 |
++check_PROGRAMS += $(TEST_PROGS) |
| 94 |
+ |
| 95 |
+ if HAVE_ATSPI2 |
| 96 |
+ TEST_PROGS += Programs/WebKit2APITests/TestWebKitAccessibility |
| 97 |
+ |
| 98 |
+-noinst_PROGRAMS += Programs/WebKit2APITests/AccessibilityTestServer |
| 99 |
++check_PROGRAMS += Programs/WebKit2APITests/AccessibilityTestServer |
| 100 |
+ endif |
| 101 |
+ |
| 102 |
+ webkit2_tests_cppflags = \ |
| 103 |
+-- |
| 104 |
+1.8.3.2 |
| 105 |
+ |
| 106 |
|
| 107 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild |
| 108 |
index 7e1b36d..6afe3a6 100644 |
| 109 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild |
| 110 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.2.ebuild |
| 111 |
@@ -178,6 +178,9 @@ src_prepare() { |
| 112 |
# bug #459978, upstream bug #113397 |
| 113 |
epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch" |
| 114 |
|
| 115 |
+ # Do not build unittests unless requested |
| 116 |
+ epatch "${FILESDIR}"/${PN}-2.2.2-unittests-build.patch |
| 117 |
+ |
| 118 |
# Prevent maintainer mode from being triggered during make |
| 119 |
AT_M4DIR=Source/autotools eautoreconf |
| 120 |
} |
Archives