Title: [132870] trunk/Source/WebKit2
- Revision
- 132870
- Author
- ser...@webkit.org
- Date
- 2012-10-29 20:42:28 -0700 (Mon, 29 Oct 2012)
Log Message
REGRESSION(r130755): All WebKit2 unit tests are failing in WebKit2 bot
https://bugs.webkit.org/show_bug.cgi?id=98864
Reviewed by Martin Robinson.
Use a dedicated directory to store WebKit2 generated resources.
* UIProcess/API/gtk/tests/GNUmakefile.am:
* UIProcess/API/gtk/tests/TestMain.cpp:
(registerGResource): load the resource from the new directory.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (132869 => 132870)
--- trunk/Source/WebKit2/ChangeLog 2012-10-30 03:34:12 UTC (rev 132869)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-30 03:42:28 UTC (rev 132870)
@@ -1,3 +1,16 @@
+2012-10-29 Sergio Villar Senin <svil...@igalia.com>
+
+ REGRESSION(r130755): All WebKit2 unit tests are failing in WebKit2 bot
+ https://bugs.webkit.org/show_bug.cgi?id=98864
+
+ Reviewed by Martin Robinson.
+
+ Use a dedicated directory to store WebKit2 generated resources.
+
+ * UIProcess/API/gtk/tests/GNUmakefile.am:
+ * UIProcess/API/gtk/tests/TestMain.cpp:
+ (registerGResource): load the resource from the new directory.
+
2012-10-29 Huang Dongsung <luxte...@company100.net>
Coordinated Graphics: Delete cached ShareableSurfaces when purging backingStores.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am (132869 => 132870)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2012-10-30 03:34:12 UTC (rev 132869)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2012-10-30 03:42:28 UTC (rev 132870)
@@ -58,11 +58,11 @@
-no-install \
-no-fast-install
-DerivedSources/WebKit2/webkit2gtk-tests-resources.gresource: Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml)
+Programs/resources/webkit2gtk-tests-resources.gresource: Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
-DISTCLEANFILES += DerivedSources/WebKit2/webkit2gtk-tests-resources.gresource
-noinst_DATA += DerivedSources/WebKit2/webkit2gtk-tests-resources.gresource
+DISTCLEANFILES += Programs/resources/webkit2gtk-tests-resources.gresource
+noinst_DATA += Programs/resources/webkit2gtk-tests-resources.gresource
noinst_LTLIBRARIES += Libraries/libWebKit2APITestCore.la
Libraries_libWebKit2APITestCore_la_SOURCES = \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp (132869 => 132870)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp 2012-10-30 03:34:12 UTC (rev 132869)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestMain.cpp 2012-10-30 03:42:28 UTC (rev 132870)
@@ -27,7 +27,7 @@
static void registerGResource(void)
{
- GOwnPtr<char> resourcesPath(g_build_filename(WEBKIT_DERIVED_SRC_DIR, "WebKit2", "webkit2gtk-tests-resources.gresource", NULL));
+ GOwnPtr<char> resourcesPath(g_build_filename(WEBKIT_EXEC_PATH, "resources", "webkit2gtk-tests-resources.gresource", NULL));
GResource* resource = g_resource_load(resourcesPath.get(), 0);
g_assert(resource);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
