Changeset 202808 in webkit

Timestamp:

Jul 4, 2016 4:44:11 AM (8 years ago)

Author:

clopez@igalia.com

Message:

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

Rubber-stamped by Michael Catanzaro.

Instead of checking for an specific Ubuntu version, query the apt
database to see which version of PHP is available.

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

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• efl/install-dependencies (modified) (1 diff)
• gtk/install-dependencies (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-07-04  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [EFL][GTK] Layout Test doesn't run on Ubuntu 16.04
+        https://bugs.webkit.org/show_bug.cgi?id=158141
+
+        Rubber-stamped by Michael Catanzaro.
+
+        Instead of checking for an specific Ubuntu version, query the apt
+        database to see which version of PHP is available.
+
+        * efl/install-dependencies:
+        * gtk/install-dependencies:
+
 2016-07-04  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Tools/efl/install-dependencies

@@ -114 +114 @@
         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
+    if apt-cache show libapache2-mod-php7.0 &>/dev/null; then
+        apt-get install libapache2-mod-php7.0
+    else
+        apt-get install libapache2-mod-php5
     fi
 }

trunk/Tools/gtk/install-dependencies

@@ -200 +200 @@
         subversion"
 
+    if apt-cache show libapache2-mod-php7.0 &>/dev/null; then
+        packages="$packages libapache2-mod-php7.0"
+    else
+        packages="$packages libapache2-mod-php5"
+    fi
+
     apt-get install $packages
 
-    installPHPWithApt
 }
 
@@ -456 +461 @@
 }
 
-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