Title: [202808] trunk/Tools
- Revision
- 202808
- Author
- clo...@igalia.com
- Date
- 2016-07-04 04:44:11 -0700 (Mon, 04 Jul 2016)
Log 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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (202807 => 202808)
--- trunk/Tools/ChangeLog 2016-07-04 11:22:59 UTC (rev 202807)
+++ trunk/Tools/ChangeLog 2016-07-04 11:44:11 UTC (rev 202808)
@@ -1,3 +1,16 @@
+2016-07-04 Carlos Alberto Lopez Perez <clo...@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.fu...@sony.com>
webkit-patch failure-reason always raises TypeError
Modified: trunk/Tools/efl/install-dependencies (202807 => 202808)
--- trunk/Tools/efl/install-dependencies 2016-07-04 11:22:59 UTC (rev 202807)
+++ trunk/Tools/efl/install-dependencies 2016-07-04 11:44:11 UTC (rev 202808)
@@ -113,17 +113,10 @@
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
+ 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
}
Modified: trunk/Tools/gtk/install-dependencies (202807 => 202808)
--- trunk/Tools/gtk/install-dependencies 2016-07-04 11:22:59 UTC (rev 202807)
+++ trunk/Tools/gtk/install-dependencies 2016-07-04 11:44:11 UTC (rev 202808)
@@ -199,9 +199,14 @@
git-svn \
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
}
function installDependenciesWithPacman {
@@ -455,16 +460,5 @@
dnf install $packages
}
-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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
