diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-25 11:25:49 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-25 11:25:49 +0200 |
| commit | 711e2a1216b4a2c68d52752906ca1f0e51832e01 (patch) | |
| tree | bf30197c2ed44f3aee4fe27496d4ff9e76d003ab /travis | |
| parent | c858d17f06179aa25f6e8aa06965313fd519d8e9 (diff) | |
| parent | f07565b0ebdfc5b8210bbf58d994ebd319014e67 (diff) | |
| download | php-git-711e2a1216b4a2c68d52752906ca1f0e51832e01.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Check class linking in VERIFY_RETURN_TYPE optimization
Simplify travis setup scripts
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/ext/curl/setup.sh | 5 | ||||
| -rwxr-xr-x | travis/ext/mysqli/setup.sh | 2 | ||||
| -rwxr-xr-x | travis/ext/pdo_mysql/setup.sh | 2 | ||||
| -rwxr-xr-x | travis/ext/pdo_pgsql/setup.sh | 2 | ||||
| -rwxr-xr-x | travis/setup-mysql.sh (renamed from travis/ext/mysql/setup.sh) | 0 | ||||
| -rwxr-xr-x | travis/setup-pgsql.sh (renamed from travis/ext/pgsql/setup.sh) | 0 |
6 files changed, 0 insertions, 11 deletions
diff --git a/travis/ext/curl/setup.sh b/travis/ext/curl/setup.sh deleted file mode 100755 index 02e8ce5bb8..0000000000 --- a/travis/ext/curl/setup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -export PHP_CURL_HTTP_REMOTE_SERVER="http://localhost:8080" -cd ./ext/curl/tests/responder -php -S localhost:8080 & -cd - diff --git a/travis/ext/mysqli/setup.sh b/travis/ext/mysqli/setup.sh deleted file mode 100755 index a3ba75cb2d..0000000000 --- a/travis/ext/mysqli/setup.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -mysql -e "CREATE DATABASE IF NOT EXISTS test" diff --git a/travis/ext/pdo_mysql/setup.sh b/travis/ext/pdo_mysql/setup.sh deleted file mode 100755 index a3ba75cb2d..0000000000 --- a/travis/ext/pdo_mysql/setup.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -mysql -e "CREATE DATABASE IF NOT EXISTS test" diff --git a/travis/ext/pdo_pgsql/setup.sh b/travis/ext/pdo_pgsql/setup.sh deleted file mode 100755 index 5f3cf67f92..0000000000 --- a/travis/ext/pdo_pgsql/setup.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -export PDO_PGSQL_TEST_DSN='pgsql:host=localhost port=5432 dbname=test user=postgres password=' diff --git a/travis/ext/mysql/setup.sh b/travis/setup-mysql.sh index a3ba75cb2d..a3ba75cb2d 100755 --- a/travis/ext/mysql/setup.sh +++ b/travis/setup-mysql.sh diff --git a/travis/ext/pgsql/setup.sh b/travis/setup-pgsql.sh index 108f47db25..108f47db25 100755 --- a/travis/ext/pgsql/setup.sh +++ b/travis/setup-pgsql.sh |