summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorDavey Shafik <me@daveyshafik.com>2012-04-27 10:36:33 -0400
committerDavey Shafik <me@daveyshafik.com>2012-05-28 06:22:25 -0400
commitf15beda158a8fbb16823baf3801409356b79cb4f (patch)
treeabe9598701d047dca822e00d4544f0c5a8e2eafb /.travis.yml
parent3966df7fc83093766e5e6862b18b8ef03ef58e09 (diff)
downloadphp-git-f15beda158a8fbb16823baf3801409356b79cb4f.tar.gz
Reformat, setup MySQL DB, call run-tests directly
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml18
1 files changed, 12 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index feff37ecc4..9bc335b058 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,17 @@
language: php
-# We only specify one version so we only get one worker
+
php:
+ # We only specify one version so we only get one worker
- 5.4
-# Compile PHP
+
+env:
+ - REPORT_EXIT_STATUS=1 TEST_PHP_EXECUTABLE=./sapi/cli/php DB=mysql
+
before_script:
+ # Compile PHP
- ./travis/compile.sh
-# Return 1 with failed testso
-env: REPORT_EXIT_STATUS=1
-# Run PHP's make test
-script: make test
+ # Create the MySQL test DB
+ - mysql -u root -e "CREATE DATABASE test"
+
+# Run PHPs run-tests.php
+script: ./sapi/cli/php run-tests.php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP"