Re-work travis config file.

.travis.yml

@@ -11,16 +11,13 @@ env:
 
 before_install:
   - sudo apt-get update > /dev/null
-
-install:
   - sudo chmod u+x tests/setup_test_env.sh
   - sudo ./tests/setup_test_env.sh $TRAVIS_BUILD_DIR
-
-# execute any number of scripts before the test run, custom env's are available as variables
-before_script:
   - if [[ "$DB" == "pgsql" ]]; then psql -c "DROP DATABASE IF EXISTS shimmie;" -U postgres; fi
   - if [[ "$DB" == "pgsql" ]]; then psql -c "create database shimmie;" -U postgres; fi
   - if [[ "$DB" == "mysql" ]]; then mysql -e "create database shimmie;" -uroot; fi
+
+install:
   - php tests/test_install.php -d $DB
 
 script: php tests/all_tests.php

tests/test_install.php

@@ -12,8 +12,6 @@ require_once('lib/simpletest/autorun.php');
 require_once('lib/simpletest/unit_tester.php');
 require_once('lib/simpletest/web_tester.php');
 require_once('lib/simpletest/reporter.php');
-require_once('tests/test_install.php');
-require_once("core/util.inc.php");
 
 // Enable all errors.
 error_reporting(E_ALL);