Make Travis CI pass when DAV was not touched

This commit is contained in:
Joas Schilling 2015-10-29 09:54:33 +01:00
parent 527ef76dd6
commit 9d35cacfda
3 changed files with 27 additions and 24 deletions

View file

@ -5,7 +5,7 @@ php:
env:
global:
- APP=dav
- TEST_DAV=$(tests/travis/changed_app.sh dav)
- TC=litmus-v2
matrix:
- DB=sqlite
@ -21,20 +21,22 @@ addons:
- realpath
before_install:
- bash tests/travis/test_for_app.sh $APP
- bash tests/travis/before_install.sh $DB
- sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/before_install.sh $DB; fi"
install:
- bash tests/travis/install.sh $DB
- sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/install.sh $DB; fi"
script:
- bash apps/$APP/tests/travis/$TC.sh
- sh -c "if [ '$TEST_DAV' != '1' ]; then echo \"Not testing DAV\"; fi"
- sh -c "if [ '$TEST_DAV' = '1' ]; then echo \"Testing DAV\"; fi"
- sh -c "if [ '$TEST_DAV' = '1' ]; then bash apps/dav/tests/travis/$TC.sh; fi"
matrix:
include:
- php: 5.4
env: DB=pgsql;TC=litmus-v1;APP=dav
env: DB=pgsql;TC=litmus-v1
# - php: 5.4
# env: DB=mysql;TC=caldavtester;APP=dav
# env: DB=mysql;TC=caldavtester
fast_finish: true

18
tests/travis/changed_app.sh Executable file
View file

@ -0,0 +1,18 @@
#!/bin/bash
#
# ownCloud
#
# @author Joas Schilling
# @author Thomas Müller
# @copyright 2015 Thomas Müller thomas.mueller@tmit.eu
#
APP=$1
FOUND=$(git diff ${TRAVIS_COMMIT_RANGE} | grep -- "^+++ b/apps/$APP/")
if [ "x$FOUND" != 'x' ]; then
echo "1"
else
echo "0"
fi

View file

@ -1,17 +0,0 @@
#!/bin/bash
#
# ownCloud
#
# @author Thomas Müller
# @copyright 2015 Thomas Müller thomas.mueller@tmit.eu
#
set -e
APP=$1
if git diff ${TRAVIS_COMMIT_RANGE} | grep -- "^+++ b/apps/$APP/"; then
echo "Executing this test config ...."
else
echo "Test config is not relevant for this change. terminating"
exit 1
fi