Commit: 0fe8b495add557251519050bb94b5dd451d9f7cb Author: Davey Shafik <m...@daveyshafik.com> Fri, 27 Apr 2012 21:27:29 -0400 Parents: f15beda158a8fbb16823baf3801409356b79cb4f Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0fe8b495add557251519050bb94b5dd451d9f7cb Log: Add extension configs, compile more extensions Changed paths: M .travis.yml M travis/compile.sh A travis/ext/mysql/setup.sh A travis/ext/mysqli/setup.sh A travis/ext/pdo_mysql/setup.sh A travis/ext/pdo_pgsql/setup.sh A travis/ext/pgsql/setup.sh Diff: diff --git a/.travis.yml b/.travis.yml index 9bc335b..8f61d7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,17 @@ php: - 5.4 env: - - REPORT_EXIT_STATUS=1 TEST_PHP_EXECUTABLE=./sapi/cli/php DB=mysql + - REPORT_EXIT_STATUS=1 TEST_PHP_EXECUTABLE=./sapi/cli/php before_script: # Compile PHP - ./travis/compile.sh - # Create the MySQL test DB - - mysql -u root -e "CREATE DATABASE test" + # Setup Extensions + - ./travis/ext/mysql/setup.sh + - ./travis/ext/mysqli/setup.sh + - ./travis/ext/pdo_mysql/setup.sh + - ./travis/ext/pgsql/setup.sh + - ./travis/ext/pdo_pgsql/setup.sh # Run PHPs run-tests.php script: ./sapi/cli/php run-tests.php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" diff --git a/travis/compile.sh b/travis/compile.sh index f80cc6b..a0fc167 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -1,4 +1,39 @@ #!/bin/bash ./buildconf -./configure --with-pdo-mysql --with-mysql --with-sqlite --with-pdo-sqlite -make +./configure \ +--with-pdo-mysql \ +--with-mysql \ +--with-mysqli \ +--with-pgsql \ +--with-pdo-pgsql \ +--with-pdo-sqlite \ +--enable-intl \ +--without-pear \ +--with-gd \ +--with-jpeg-dir=/usr \ +--with-png-dir=/usr \ +--enable-exif \ +--enable-zip \ +--with-zlib \ +--with-zlib-dir=/usr \ +--with-mcrypt=/usr \ +--enable-soap \ +--enable-xmlreader \ +--with-xsl \ +--with-curl=/usr \ +--with-tidy \ +--with-xmlrpc \ +--enable-sysvsem \ +--enable-sysvshm \ +--enable-shmop \ +--enable-pcntl \ +--with-readline \ +--enable-mbstring \ +--with-curl \ +--with-gettext \ +--enable-sockets \ +--with-bz2 \ +--enable-bcmath \ +--enable-fastcgi \ +--with-mime-magic +make \ No newline at end of file diff --git a/travis/ext/mysql/setup.sh b/travis/ext/mysql/setup.sh new file mode 100755 index 0000000..994fad1 --- /dev/null +++ b/travis/ext/mysql/setup.sh @@ -0,0 +1,2 @@ +#!/bin/bash +mysql -u root -e "CREATE DATABASE IF NOT EXISTS test" diff --git a/travis/ext/mysqli/setup.sh b/travis/ext/mysqli/setup.sh new file mode 100755 index 0000000..994fad1 --- /dev/null +++ b/travis/ext/mysqli/setup.sh @@ -0,0 +1,2 @@ +#!/bin/bash +mysql -u root -e "CREATE DATABASE IF NOT EXISTS test" diff --git a/travis/ext/pdo_mysql/setup.sh b/travis/ext/pdo_mysql/setup.sh new file mode 100755 index 0000000..994fad1 --- /dev/null +++ b/travis/ext/pdo_mysql/setup.sh @@ -0,0 +1,2 @@ +#!/bin/bash +mysql -u root -e "CREATE DATABASE IF NOT EXISTS test" diff --git a/travis/ext/pdo_pgsql/setup.sh b/travis/ext/pdo_pgsql/setup.sh new file mode 100755 index 0000000..6f16f72 --- /dev/null +++ b/travis/ext/pdo_pgsql/setup.sh @@ -0,0 +1,2 @@ +#!/bin/bash +export PDO_PGSQL_TEST_DSN='pgsql:host=localhost port=5432 dbname=test user=postgres password=' \ No newline at end of file diff --git a/travis/ext/pgsql/setup.sh b/travis/ext/pgsql/setup.sh new file mode 100755 index 0000000..32b39a4 --- /dev/null +++ b/travis/ext/pgsql/setup.sh @@ -0,0 +1,4 @@ +#!/bin/bash +echo ' +<?php $conn_str .= " user=postgres"; ?>' >> "./ext/pgsql/tests/config.inc" +psql -c 'create database test;' -U postgres \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php