From 636d0635db15b01e8057a5ef61c42be9619aedc1 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 4 May 2015 15:13:35 +0200 Subject: [PATCH] Combine autotest-hhvm.sh with autotest.sh --- autotest-hhvm.sh | 217 +---------------------------------------------- autotest.sh | 25 ++++-- 2 files changed, 23 insertions(+), 219 deletions(-) diff --git a/autotest-hhvm.sh b/autotest-hhvm.sh index 7a8452c7f0..6f3645c3ae 100755 --- a/autotest-hhvm.sh +++ b/autotest-hhvm.sh @@ -1,214 +1,3 @@ -#!/bin/bash -# -# ownCloud -# -# @author Vincent Petry -# @author Morris Jobke -# @author Robin McCorkell -# @author Thomas Müller -# @author Andreas Fischer -# @author Joas Schilling -# @author Lukas Reschke -# @copyright 2012-2015 Thomas Müller thomas.mueller@tmit.eu -# - -set -e - -#$EXECUTOR_NUMBER is set by Jenkins and allows us to run autotest in parallel -DATABASENAME=oc_autotest$EXECUTOR_NUMBER -DATABASEUSER=oc_autotest$EXECUTOR_NUMBER -ADMINLOGIN=admin$EXECUTOR_NUMBER -BASEDIR=$PWD - -DBCONFIGS="sqlite mysql pgsql oci" -PHPUNIT=$(which phpunit) -HHVM=$(which hhvm) - -function print_syntax { - echo -e "Syntax: ./autotest-hhvm.sh [dbconfigname] [testfile]\n" >&2 - echo -e "\t\"dbconfigname\" can be one of: $DBCONFIGS" >&2 - echo -e "\t\"testfile\" is the name of a test file, for example lib/template.php" >&2 - echo -e "\nExample: ./autotest.sh sqlite lib/template.php" >&2 - echo "will run the test suite from \"tests/lib/template.php\"" >&2 - echo -e "\nIf no arguments are specified, all tests will be run with all database configs" >&2 -} - -if ! [ -x "$PHPUNIT" ]; then - echo "phpunit executable not found, please install phpunit version >= 3.7" >&2 - exit 3 -fi - -if ! [ -x "$HHVM" ]; then - echo "hhvm executable not found, please install hhvm" >&2 - exit 3 -fi - -PHPUNIT_VERSION=$(hhvm "$PHPUNIT" --version | cut -d" " -f2) -PHPUNIT_MAJOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f1) -PHPUNIT_MINOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f2) - -if ! [ $PHPUNIT_MAJOR_VERSION -gt 3 -o \( $PHPUNIT_MAJOR_VERSION -eq 3 -a $PHPUNIT_MINOR_VERSION -ge 7 \) ]; then - echo "phpunit version >= 3.7 required. Version found: $PHPUNIT_VERSION" >&2 - exit 4 -fi - -if ! [ -w config -a -w config/config.php ]; then - echo "Please enable write permissions on config and config/config.php" >&2 - exit 1 -fi - -if [ "$1" ]; then - FOUND=0 - for DBCONFIG in $DBCONFIGS; do - if [ "$1" = $DBCONFIG ]; then - FOUND=1 - break - fi - done - if [ $FOUND = 0 ]; then - echo -e "Unknown database config name \"$1\"\n" >&2 - print_syntax - exit 2 - fi -fi - -# Back up existing (dev) config if one exists and backup not already there -if [ -f config/config.php ] && [ ! -f config/config-autotest-backup.php ]; then - mv config/config.php config/config-autotest-backup.php -fi - -function cleanup_config { - cd "$BASEDIR" - # Restore existing config - if [ -f config/config-autotest-backup.php ]; then - mv config/config-autotest-backup.php config/config.php - fi - # Remove autotest config - if [ -f config/autoconfig.php ]; then - rm config/autoconfig.php - fi -} - -# restore config on exit -trap cleanup_config EXIT - -# use tmpfs for datadir - should speedup unit test execution -if [ -d /dev/shm ]; then - DATADIR=/dev/shm/data-autotest$EXECUTOR_NUMBER -else - DATADIR=$BASEDIR/data-autotest -fi - -echo "Using database $DATABASENAME" - -function execute_tests { - echo "Setup environment for $1 testing ..." - # back to root folder - cd "$BASEDIR" - - # revert changes to tests/data - git checkout tests/data - - # reset data directory - rm -rf "$DATADIR" - mkdir "$DATADIR" - - # remove the old config file - #rm -rf config/config.php - cp tests/preseed-config.php config/config.php - - # drop database - if [ "$1" == "mysql" ] ; then - mysql -u $DATABASEUSER -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" || true - fi - if [ "$1" == "pgsql" ] ; then - dropdb -U $DATABASEUSER $DATABASENAME || true - fi - if [ "$1" == "oci" ] ; then - echo "drop the database" - sqlplus -s -l / as sysdba <&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 }