Commit b1227c0d authored by sergio@webkit.org's avatar sergio@webkit.org

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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@132870 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent abd60517
2012-10-29 Sergio Villar Senin <svillar@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 <luxtella@company100.net>
Coordinated Graphics: Delete cached ShareableSurfaces when purging backingStores.
......
......@@ -58,11 +58,11 @@ webkit2_tests_ldflags = \
-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 = \
......
......@@ -27,7 +27,7 @@ void afterAll();
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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment