]> granicus.if.org Git - php/commitdiff
Add extension configs, compile more extensions
authorDavey Shafik <me@daveyshafik.com>
Sat, 28 Apr 2012 01:27:29 +0000 (21:27 -0400)
committerDavey Shafik <me@daveyshafik.com>
Mon, 28 May 2012 10:22:25 +0000 (06:22 -0400)
.travis.yml
travis/compile.sh
travis/ext/mysql/setup.sh [new file with mode: 0755]
travis/ext/mysqli/setup.sh [new file with mode: 0755]
travis/ext/pdo_mysql/setup.sh [new file with mode: 0755]
travis/ext/pdo_pgsql/setup.sh [new file with mode: 0755]
travis/ext/pgsql/setup.sh [new file with mode: 0755]

index 9bc335b058622490917d678558a0414a05395d63..8f61d7fb136bce0996fbedf3f303d22fa5cea0f0 100644 (file)
@@ -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"
index f80cc6bd0b6f54d5476527bf29796600a7ce738d..a0fc167a15bf73361bb5b23ca58d906c2a573ba3 100755 (executable)
@@ -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 (executable)
index 0000000..994fad1
--- /dev/null
@@ -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 (executable)
index 0000000..994fad1
--- /dev/null
@@ -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 (executable)
index 0000000..994fad1
--- /dev/null
@@ -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 (executable)
index 0000000..6f16f72
--- /dev/null
@@ -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 (executable)
index 0000000..32b39a4
--- /dev/null
@@ -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