Title: [130390] trunk
- Revision
- 130390
- Author
- [email protected]
- Date
- 2012-10-04 07:45:36 -0700 (Thu, 04 Oct 2012)
Log Message
[EFL] Run unit tests with Xvfb
https://bugs.webkit.org/show_bug.cgi?id=98389
Patch by Christophe Dumez <[email protected]> on 2012-10-04
Reviewed by Laszlo Gombos.
Source/WebKit2:
* UIProcess/API/efl/ewk_main.cpp:
(ewk_init): Call ecore_evas_shutdown() instead of
edje_shutdown() when ecore_x_init() fails.
(ewk_shutdown): Remove extra call to edje_shutdown().
* UIProcess/API/efl/tests/test_ewk2_view.cpp:
(TEST_F): Temporarily disable fullscreen unit tests
until we get them working with Xvfb.
Tools:
Run EFL unit tests with Xvfb, similarly to GTK port.
* Scripts/run-efl-tests:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (130389 => 130390)
--- trunk/Source/WebKit2/ChangeLog 2012-10-04 13:42:11 UTC (rev 130389)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-04 14:45:36 UTC (rev 130390)
@@ -1,3 +1,18 @@
+2012-10-04 Christophe Dumez <[email protected]>
+
+ [EFL] Run unit tests with Xvfb
+ https://bugs.webkit.org/show_bug.cgi?id=98389
+
+ Reviewed by Laszlo Gombos.
+
+ * UIProcess/API/efl/ewk_main.cpp:
+ (ewk_init): Call ecore_evas_shutdown() instead of
+ edje_shutdown() when ecore_x_init() fails.
+ (ewk_shutdown): Remove extra call to edje_shutdown().
+ * UIProcess/API/efl/tests/test_ewk2_view.cpp:
+ (TEST_F): Temporarily disable fullscreen unit tests
+ until we get them working with Xvfb.
+
2012-10-04 Balazs Kelemen <[email protected]>
Don't allow compositing to be disabled in forced compositing mode
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp (130389 => 130390)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp 2012-10-04 13:42:11 UTC (rev 130389)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp 2012-10-04 14:45:36 UTC (rev 130390)
@@ -90,7 +90,7 @@
#ifdef HAVE_ECORE_X
error_ecore_x:
- edje_shutdown();
+ ecore_evas_shutdown();
#endif
error_ecore_evas:
ecore_shutdown();
@@ -113,7 +113,6 @@
#ifdef HAVE_ECORE_X
ecore_x_shutdown();
#endif
- edje_shutdown();
ecore_evas_shutdown();
ecore_shutdown();
evas_shutdown();
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp (130389 => 130390)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp 2012-10-04 13:42:11 UTC (rev 130389)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp 2012-10-04 14:45:36 UTC (rev 130390)
@@ -320,7 +320,7 @@
ASSERT_TRUE(expectedState == windowState);
}
-TEST_F(EWK2UnitTestBase, ewk_view_full_screen_enter)
+TEST_F(EWK2UnitTestBase, DISABLED_ewk_view_full_screen_enter)
{
const char fullscreenHTML[] =
"<!doctype html><head><script>function makeFullScreen(){"
@@ -340,7 +340,7 @@
checkFullScreenProperty(webView(), true);
}
-TEST_F(EWK2UnitTestBase, ewk_view_full_screen_exit)
+TEST_F(EWK2UnitTestBase, DISABLED_ewk_view_full_screen_exit)
{
const char fullscreenHTML[] =
"<!doctype html><head><script>function makeFullScreenAndExit(){"
Modified: trunk/Tools/ChangeLog (130389 => 130390)
--- trunk/Tools/ChangeLog 2012-10-04 13:42:11 UTC (rev 130389)
+++ trunk/Tools/ChangeLog 2012-10-04 14:45:36 UTC (rev 130390)
@@ -1,3 +1,14 @@
+2012-10-04 Christophe Dumez <[email protected]>
+
+ [EFL] Run unit tests with Xvfb
+ https://bugs.webkit.org/show_bug.cgi?id=98389
+
+ Reviewed by Laszlo Gombos.
+
+ Run EFL unit tests with Xvfb, similarly to GTK port.
+
+ * Scripts/run-efl-tests:
+
2012-10-04 Adrian Perez de Castro <[email protected]>
[GTK] Enable inspector by default in GtkLauncher/MiniBrowser
Modified: trunk/Tools/Scripts/run-efl-tests (130389 => 130390)
--- trunk/Tools/Scripts/run-efl-tests 2012-10-04 13:42:11 UTC (rev 130389)
+++ trunk/Tools/Scripts/run-efl-tests 2012-10-04 14:45:36 UTC (rev 130390)
@@ -32,9 +32,30 @@
use lib $FindBin::Bin;
use webkitdirs;
-setConfiguration();
+my $xvfb_display = ":55";
+my $xvfb_pid = fork();
+exit(1) if not defined $xvfb_pid;
+
# Tell CTest to dump gtest output in case of failure.
$ENV{CTEST_OUTPUT_ON_FAILURE} = "1";
+$ENV{DISPLAY} = $xvfb_display;
-buildCMakeProjectOrExit(0, "Efl", undef, "test", cmakeBasedPortArguments());
+if ($xvfb_pid == 0) {
+ # Start Xvfb
+ my @xvfb_args = ( "Xvfb $xvfb_display -screen 0 800x600x24 -nolisten tcp > /dev/null 2>&1" );
+ exec(@xvfb_args);
+} else {
+ setConfiguration();
+
+ my $returnCode = exitStatus(generateBuildSystemFromCMakeProject("Efl", undef, cmakeBasedPortArguments()));
+ exit($returnCode) if $returnCode;
+
+ $returnCode = exitStatus(buildCMakeGeneratedProject("test"));
+
+ # Kill Xvfb
+ kill(15, $xvfb_pid);
+
+ exit($returnCode);
+}
+
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
