Title: [183112] trunk/Tools
- Revision
- 183112
- Author
- [email protected]
- Date
- 2015-04-22 10:39:38 -0700 (Wed, 22 Apr 2015)
Log Message
Unreviewed. Do not run GTK+ user media unit tests when ENABLE_MEDIA_STREAM is disabled.
* TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:
(beforeAll):
(testWebViewAudioOnlyUserMediaPermissionRequests):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (183111 => 183112)
--- trunk/Tools/ChangeLog 2015-04-22 17:36:44 UTC (rev 183111)
+++ trunk/Tools/ChangeLog 2015-04-22 17:39:38 UTC (rev 183112)
@@ -1,3 +1,11 @@
+2015-04-22 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Do not run GTK+ user media unit tests when ENABLE_MEDIA_STREAM is disabled.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:
+ (beforeAll):
+ (testWebViewAudioOnlyUserMediaPermissionRequests):
+
2015-04-22 Michael Catanzaro <[email protected]>
Add myself to watchlist
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp (183111 => 183112)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp 2015-04-22 17:36:44 UTC (rev 183111)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp 2015-04-22 17:39:38 UTC (rev 183112)
@@ -673,6 +673,7 @@
test->addLogFatalFlag(G_LOG_LEVEL_WARNING);
}
+#if ENABLE(MEDIA_STREAM)
static void testWebViewUserMediaPermissionRequests(UIClientTest* test, gconstpointer)
{
WebKitSettings* settings = webkit_web_view_get_settings(test->m_webView);
@@ -741,6 +742,7 @@
webkit_settings_set_enable_media_stream(settings, enabled);
}
+#endif // ENABLE(MEDIA_STREAM)
class FileChooserTest: public UIClientTest {
public:
@@ -969,8 +971,10 @@
UIClientTest::add("WebKitWebView", "window-properties", testWebViewWindowProperties);
UIClientTest::add("WebKitWebView", "mouse-target", testWebViewMouseTarget);
UIClientTest::add("WebKitWebView", "geolocation-permission-requests", testWebViewGeolocationPermissionRequests);
+#if ENABLE(MEDIA_STREAM)
UIClientTest::add("WebKitWebView", "usermedia-permission-requests", testWebViewUserMediaPermissionRequests);
UIClientTest::add("WebKitWebView", "audio-usermedia-permission-request", testWebViewAudioOnlyUserMediaPermissionRequests);
+#endif
FileChooserTest::add("WebKitWebView", "file-chooser-request", testWebViewFileChooserRequest);
ColorChooserTest::add("WebKitWebView", "color-chooser-request", testWebViewColorChooserRequest);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
