aboutsummaryrefslogtreecommitdiffstats
path: root/travis
diff options
context:
space:
mode:
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/check-executable-files.sh5
-rwxr-xr-xtravis/check-image-icc-profiles.sh3
-rwxr-xr-xtravis/check-sami-parse-errors.sh3
-rwxr-xr-xtravis/ext-sniff.sh2
-rwxr-xr-xtravis/phing-sniff.sh3
-rwxr-xr-xtravis/setup-database.sh8
-rwxr-xr-xtravis/setup-phpbb.sh7
7 files changed, 21 insertions, 10 deletions
diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh
index e1a1625d18..4ec037e6ce 100755
--- a/travis/check-executable-files.sh
+++ b/travis/check-executable-files.sh
@@ -12,10 +12,11 @@ set -e
DB=$1
TRAVIS_PHP_VERSION=$2
-root="$3"
+NOTESTS=$3
+root="$4"
path="${root}phpBB/"
-if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
+if [ "$NOTESTS" == '1' ]
then
# Check the permissions of the files
diff --git a/travis/check-image-icc-profiles.sh b/travis/check-image-icc-profiles.sh
index df13c5f4e2..05c7de2d27 100755
--- a/travis/check-image-icc-profiles.sh
+++ b/travis/check-image-icc-profiles.sh
@@ -12,8 +12,9 @@ set -e
DB=$1
TRAVIS_PHP_VERSION=$2
+NOTESTS=$3
-if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
+if [ "$NOTESTS" == '1' ]
then
find . -type f -a -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' -a -not -wholename '*vendor/*' | \
parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}'
diff --git a/travis/check-sami-parse-errors.sh b/travis/check-sami-parse-errors.sh
index 84976a7666..4cc2cee525 100755
--- a/travis/check-sami-parse-errors.sh
+++ b/travis/check-sami-parse-errors.sh
@@ -12,8 +12,9 @@ set -e
DB=$1
TRAVIS_PHP_VERSION=$2
+NOTESTS=$3
-if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
+if [ "$NOTESTS" == '1' ]
then
# Workarounds for
# https://github.com/fabpot/Sami/issues/116
diff --git a/travis/ext-sniff.sh b/travis/ext-sniff.sh
index 4e557a41c1..61ceda6834 100755
--- a/travis/ext-sniff.sh
+++ b/travis/ext-sniff.sh
@@ -10,7 +10,7 @@
#
set -e
set -x
-
+
DB=$1
TRAVIS_PHP_VERSION=$2
EXTNAME=$3
diff --git a/travis/phing-sniff.sh b/travis/phing-sniff.sh
index 660d1764c2..3f43b64130 100755
--- a/travis/phing-sniff.sh
+++ b/travis/phing-sniff.sh
@@ -13,8 +13,9 @@ set -x
DB=$1
TRAVIS_PHP_VERSION=$2
+NOTESTS=$3
-if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
+if [ "$NOTESTS" == '1' ]
then
cd build
../phpBB/vendor/bin/phing sniff
diff --git a/travis/setup-database.sh b/travis/setup-database.sh
index 4ba9157d9d..3771f19073 100755
--- a/travis/setup-database.sh
+++ b/travis/setup-database.sh
@@ -13,6 +13,12 @@ set -x
DB=$1
TRAVIS_PHP_VERSION=$2
+NOTESTS=$3
+
+if [ "$NOTESTS" == '1' ]
+then
+ exit 0
+fi
if [ "$DB" == "postgres" ]
then
@@ -20,7 +26,7 @@ then
psql -c 'create database phpbb_tests;' -U postgres
fi
-if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
+if [ "$TRAVIS_PHP_VERSION" == "5.4" -a "$DB" == "mysqli" ]
then
mysql -e 'SET GLOBAL storage_engine=MyISAM;'
fi
diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh
index 369c477860..30f79ee0cb 100755
--- a/travis/setup-phpbb.sh
+++ b/travis/setup-phpbb.sh
@@ -13,8 +13,9 @@ set -x
DB=$1
TRAVIS_PHP_VERSION=$2
+NOTESTS=$3
-if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ]
+if [ "$NOTESTS" == '1' ]
then
travis/setup-exiftool.sh
travis/setup-unbuffer.sh
@@ -25,12 +26,12 @@ then
travis/setup-mariadb.sh
fi
-if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]
+if [ "$NOTESTS" != '1' -a "$TRAVIS_PHP_VERSION" != "hhvm" ]
then
travis/setup-php-extensions.sh
fi
-if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` == "1" ]
+if [ "$NOTESTS" != '1' ]
then
travis/setup-webserver.sh
travis/install-phpbb-test-dependencies.sh