Title: [96213] trunk/Source/WebKit2
- Revision
- 96213
- Author
- [email protected]
- Date
- 2011-09-28 03:56:05 -0700 (Wed, 28 Sep 2011)
Log Message
[GTK] Fix Programs/unittests/webkit2/testwebview
https://bugs.webkit.org/show_bug.cgi?id=68993
Reviewed by Philippe Normand.
* GNUmakefile.am: Add -DWEBKIT_EXEC_PATH.
* UIProcess/API/gtk/tests/testwebview.c:
(main): Get WebProcess path from WEBKIT_EXEC_PATH environment
variable.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96212 => 96213)
--- trunk/Source/WebKit2/ChangeLog 2011-09-28 09:54:22 UTC (rev 96212)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-28 10:56:05 UTC (rev 96213)
@@ -1,3 +1,15 @@
+2011-09-28 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Fix Programs/unittests/webkit2/testwebview
+ https://bugs.webkit.org/show_bug.cgi?id=68993
+
+ Reviewed by Philippe Normand.
+
+ * GNUmakefile.am: Add -DWEBKIT_EXEC_PATH.
+ * UIProcess/API/gtk/tests/testwebview.c:
+ (main): Get WebProcess path from WEBKIT_EXEC_PATH environment
+ variable.
+
2011-09-27 Mark Hahnenberg <[email protected]>
Add static version of JSCell::getCallData
Modified: trunk/Source/WebKit2/GNUmakefile.am (96212 => 96213)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-09-28 09:54:22 UTC (rev 96212)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-28 10:56:05 UTC (rev 96213)
@@ -994,6 +994,7 @@
noinst_PROGRAMS += $(TEST_PROGS)
webkit2_tests_cflags = \
+ -DWEBKIT_EXEC_PATH=\"${shell pwd}/$(top_builddir)/Programs\" \
-I$(srcdir)/Source \
-I$(srcdir)/Source/WebKit2 \
-I$(top_builddir)/DerivedSources/WebKit2/include \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/testwebview.c (96212 => 96213)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/testwebview.c 2011-09-28 09:54:22 UTC (rev 96212)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/testwebview.c 2011-09-28 10:56:05 UTC (rev 96213)
@@ -34,6 +34,8 @@
g_thread_init(NULL);
gtk_test_init(&argc, &argv, NULL);
+ g_setenv("WEBKIT_EXEC_PATH", WEBKIT_EXEC_PATH, FALSE);
+
g_test_bug_base("https://bugs.webkit.org/");
g_test_add_func("/webkit2/webview/default_context",
testWebViewDefaultContext);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
