Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@owncloud.com>2015-05-04 16:13:35 +0300
committerAndreas Fischer <bantu@owncloud.com>2015-05-04 17:37:23 +0300
commit636d0635db15b01e8057a5ef61c42be9619aedc1 (patch)
tree871cb9806aa1bcd4362bd869aa2c2da0540fd575 /autotest.sh
parent17fedc80dac7acd3d85f1f132455e94d4fd920c6 (diff)
Combine autotest-hhvm.sh with autotest.sh
Diffstat (limited to 'autotest.sh')
-rwxr-xr-xautotest.sh25
1 files changed, 20 insertions, 5 deletions
diff --git a/autotest.sh b/autotest.sh
index 0c0d5ba0996..8b8017eba80 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -22,6 +22,14 @@ ADMINLOGIN=admin$EXECUTOR_NUMBER
BASEDIR=$PWD
DBCONFIGS="sqlite mysql pgsql oci"
+
+# $PHP_EXE is run through 'which' and as such e.g. 'php' or 'hhvm' is usually
+# sufficient. Due to the behaviour of 'which', $PHP_EXE may also be a path
+# (absolute or not) to an executable, e.g. ./code/projects/php-src/sapi/cli/php.
+if [ -z "$PHP_EXE" ]; then
+ PHP_EXE=php
+fi
+PHP=$(which "$PHP_EXE")
PHPUNIT=$(which phpunit)
function print_syntax {
@@ -33,12 +41,19 @@ function print_syntax {
echo -e "\nIf no arguments are specified, all tests will be run with all database configs" >&2
}
+if [ -x "$PHP" ]; then
+ echo "Using PHP executable $PHP"
+else
+ echo "Could not find PHP executable $PHP_EXE" >&2
+ exit 3
+fi
+
if ! [ -x "$PHPUNIT" ]; then
echo "phpunit executable not found, please install phpunit version >= 3.7" >&2
exit 3
fi
-PHPUNIT_VERSION=$("$PHPUNIT" --version | cut -d" " -f2)
+PHPUNIT_VERSION=$("$PHP" "$PHPUNIT" --version | cut -d" " -f2)
PHPUNIT_MAJOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f1)
PHPUNIT_MINOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f2)
@@ -136,20 +151,20 @@ function execute_tests {
# trigger installation
echo "Installing ...."
- ./occ maintenance:install --database=$1 --database-name=$DATABASENAME --database-host=$DATABASEHOST --database-user=$DATABASEUSER --database-pass=owncloud --database-table-prefix=oc_ --admin-user=$ADMINLOGIN --admin-pass=admin --data-dir=$DATADIR
+ "$PHP" ./occ maintenance:install --database=$1 --database-name=$DATABASENAME --database-host=$DATABASEHOST --database-user=$DATABASEUSER --database-pass=owncloud --database-table-prefix=oc_ --admin-user=$ADMINLOGIN --admin-pass=admin --data-dir=$DATADIR
#test execution
echo "Testing with $1 ..."
cd tests
rm -rf "coverage-html-$1"
mkdir "coverage-html-$1"
- php -f enable_all.php | grep -i -C9999 error && echo "Error during setup" && exit 101
+ "$PHP" -f enable_all.php | grep -i -C9999 error && echo "Error during setup" && exit 101
if [ -z "$NOCOVERAGE" ]; then
- "$PHPUNIT" --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" --coverage-clover "autotest-clover-$1.xml" --coverage-html "coverage-html-$1" "$2" "$3"
+ "$PHP" "$PHPUNIT" --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" --coverage-clover "autotest-clover-$1.xml" --coverage-html "coverage-html-$1" "$2" "$3"
RESULT=$?
else
echo "No coverage"
- "$PHPUNIT" --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" "$2" "$3"
+ "$PHP" "$PHPUNIT" --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" "$2" "$3"
RESULT=$?
fi
}