Changeset 202158 in webkit

Timestamp:

Jun 16, 2016 9:56:57 PM (8 years ago)

Author:

Gyuyoung Kim

Message:

[EFL][GTK] LayoutTest doesn't run on Ubuntu 16.04
​https://bugs.webkit.org/show_bug.cgi?id=158141

Reviewed by Michael Catanzaro.

Tools:

• Scripts/webkitpy/port/base.py: Detect php version in system, then use it.

(Port._is_debian_php_version_7):
(Port._debian_php_version):
(Port._apache_config_file_name_for_platform):

• efl/install-dependencies:
• gtk/install-dependencies:

LayoutTests:

• http/conf/debian-httpd-2.4-php7.conf: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/conf/debian-httpd-2.4-php7.conf (added)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/port/base.py (modified) (3 diffs)
• Tools/efl/install-dependencies (modified) (1 diff)
• Tools/gtk/install-dependencies (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-16  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
+
+        [EFL][GTK] LayoutTest doesn't run on Ubuntu 16.04
+        https://bugs.webkit.org/show_bug.cgi?id=158141
+
+        Reviewed by Michael Catanzaro.
+
+        * http/conf/debian-httpd-2.4-php7.conf: Added.
+
 2016-06-15  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2016-06-16  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
+
+        [EFL][GTK] LayoutTest doesn't run on Ubuntu 16.04
+        https://bugs.webkit.org/show_bug.cgi?id=158141
+
+        Reviewed by Michael Catanzaro.
+
+        * Scripts/webkitpy/port/base.py: Detect php version in system, then use it.
+        (Port._is_debian_php_version_7):
+        (Port._debian_php_version):
+        (Port._apache_config_file_name_for_platform):
+        * efl/install-dependencies:
+        * gtk/install-dependencies:
+
 2016-06-16  Filip Pizlo  <fpizlo@apple.com>
 

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

@@ -1131 +1131 @@
         return None
 
+    def _is_debian_php_version_7(self):
+        if self._filesystem.exists("/usr/lib/apache2/modules/libphp7.0.so"):
+            return True
+        return False
+
     # FIXME: This belongs on some platform abstraction instead of Port.
     def _is_redhat_based(self):
@@ -1144 +1149 @@
         config = self._executive.run_command([self._path_to_apache(), '-v'])
         return re.sub(r'(?:.|\n)*Server version: Apache/(\d+\.\d+)(?:.|\n)*', r'\1', config)
+
+    def _debian_php_version(self):
+        if self._is_debian_php_version_7():
+            return "-php7"
+        return ""
 
     # We pass sys_platform into this method to make it easy to unit test.
@@ -1153 +1163 @@
                 return 'fedora-httpd-' + self._apache_version() + '.conf'
             if self._is_debian_based():
-                return 'debian-httpd-' + self._apache_version() + '.conf'
+                return 'debian-httpd-' + self._apache_version() + self._debian_php_version() + '.conf'
             if self._is_arch_based():
                 return 'archlinux-httpd.conf'

trunk/Tools/efl/install-dependencies

@@ -112 +112 @@
     apt-get install \
         apache2 \
-        libapache2-mod-php5 \
         libruby \
         xvfb
+
+    installPHPWithApt
+}
+
+function installPHPWithApt {
+    if [ -f "/etc/os-release" ]; then
+        ubuntu_version=`grep VERSION_ID /etc/os-release`
+        if [[ $ubuntu_version == *VERSION_ID=\"16.04* ]]; then
+            apt-get install libapache2-mod-php7.0
+        else
+            apt-get install libapache2-mod-php5
+        fi
+    fi
 }
 

trunk/Tools/gtk/install-dependencies

@@ -139 +139 @@
         dbus-x11 \
         libapache2-mod-bw \
-        libapache2-mod-php5 \
         libgpg-error-dev \
         pulseaudio-utils \
@@ -193 +192 @@
 
     apt-get install $packages
+
+    installPHPWithApt
 }
 
@@ -433 +434 @@
 }
 
+function installPHPWithApt {
+    if [ -f "/etc/os-release" ]; then
+        ubuntu_version=`grep VERSION_ID /etc/os-release`
+        if [[ $ubuntu_version == *VERSION_ID=\"16.04* ]]; then
+            apt-get install libapache2-mod-php7.0
+        else
+            apt-get install libapache2-mod-php5
+        fi
+    fi
+}
+
 checkInstaller