Changeset 260580 in webkit

Timestamp:

Apr 23, 2020 10:36:53 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r260562.
​https://bugs.webkit.org/show_bug.cgi?id=210924

It caused 3 new failures and 1 timeout in GTK API tests
(Requested by clopez on #webkit).

Reverted changeset:

"[GTK][WPE] White-list more GStreamer environment variables in
webkitpy"
​https://bugs.webkit.org/show_bug.cgi?id=210854
​https://trac.webkit.org/changeset/260562

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/gtk.py (modified) (1 diff)
• Scripts/webkitpy/port/wpe.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-23  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r260562.
+        https://bugs.webkit.org/show_bug.cgi?id=210924
+
+        It caused 3 new failures and 1 timeout in GTK API tests
+        (Requested by clopez on #webkit).
+
+        Reverted changeset:
+
+        "[GTK][WPE] White-list more GStreamer environment variables in
+        webkitpy"
+        https://bugs.webkit.org/show_bug.cgi?id=210854
+        https://trac.webkit.org/changeset/260562
+
 2020-04-23  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/gtk.py

@@ -125 +125 @@
         self._copy_value_from_environ_if_set(environment, 'WEBKIT_JHBUILD')
         self._copy_value_from_environ_if_set(environment, 'WEBKIT_TOP_LEVEL')
-        self._copy_value_from_environ_if_set(environment, 'WEBKIT_GST_USE_PLAYBIN3')
-        for gst_variable in ('DEBUG', 'DEBUG_DUMP_DOT_DIR', 'DEBUG_FILE', 'DEBUG_NO_COLOR',
-                             'PLUGIN_SCANNER', 'PLUGIN_PATH', 'PLUGIN_SYSTEM_PATH', 'REGISTRY'):
-            self._copy_value_from_environ_if_set(environment, 'GST_%s' % gst_variable)
+        self._copy_value_from_environ_if_set(environment, 'USE_PLAYBIN3')
+        self._copy_value_from_environ_if_set(environment, 'GST_DEBUG')
+        self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_DUMP_DOT_DIR')
+        self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_FILE')
+        self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_NO_COLOR')
 
         # Configure the software libgl renderer if jhbuild ready and we test inside a virtualized window system

trunk/Tools/Scripts/webkitpy/port/wpe.py

@@ -80 +80 @@
         self._copy_value_from_environ_if_set(environment, 'WEBKIT_JHBUILD')
         self._copy_value_from_environ_if_set(environment, 'WEBKIT_TOP_LEVEL')
+        self._copy_value_from_environ_if_set(environment, 'USE_PLAYBIN3')
+        self._copy_value_from_environ_if_set(environment, 'GST_DEBUG')
+        self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_DUMP_DOT_DIR')
+        self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_FILE')
+        self._copy_value_from_environ_if_set(environment, 'GST_DEBUG_NO_COLOR')
         self._copy_value_from_environ_if_set(environment, 'LIBGL_ALWAYS_SOFTWARE')
         self._copy_value_from_environ_if_set(environment, 'XR_RUNTIME_JSON')
-        self._copy_value_from_environ_if_set(environment, 'WEBKIT_GST_USE_PLAYBIN3')
-        for gst_variable in ('DEBUG', 'DEBUG_DUMP_DOT_DIR', 'DEBUG_FILE', 'DEBUG_NO_COLOR',
-                             'PLUGIN_SCANNER', 'PLUGIN_PATH', 'PLUGIN_SYSTEM_PATH', 'REGISTRY'):
-            self._copy_value_from_environ_if_set(environment, 'GST_%s' % gst_variable)
         return environment