com php-src: Simplify travis setup scripts: .travis.yml travis/ext/curl/setup.sh travis/ext/mysql/setup.sh travis/ext/mysqli/setup.sh
travis/ext/pdo_mysql/setup.sh travis/ext/pdo_pgsql/setup.sh travis/ext/pgsql/setup.sh travis/setup-mysql.sh travis/setup-pgsql.sh
| From: | Nikita Popov | Date: | Fri, 25 Oct 2019 09:15:27 +0000 |
| Subject: | com php-src: Simplify travis setup scripts: .travis.yml travis/ext/curl/setup.sh travis/ext/mysql/setup.sh travis/ext/mysqli/setup.sh travis/ext/pdo_mysql/setup.sh travis/ext/pdo_pgsql/setup.sh travis/ext/pgsql/setup.sh travis/setup-mysql.sh travis/setup-pgsql.sh |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-109057@lists.php.net to get a copy of this message | ||
Commit: a8b4e40fa225f4f2524cc29c37119d00005ccca1
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 25 Oct 2019 11:14:56 +0200
Parents: 184ba0c91c3b688538d0274625241c640a8952eb
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a8b4e40fa225f4f2524cc29c37119d00005ccca1
Log:
Simplify travis setup scripts
Reduce duplication.
Changed paths:
M .travis.yml
D travis/ext/curl/setup.sh
D travis/ext/mysql/setup.sh
D travis/ext/mysqli/setup.sh
D travis/ext/pdo_mysql/setup.sh
D travis/ext/pdo_pgsql/setup.sh
D travis/ext/pgsql/setup.sh
A travis/setup-mysql.sh
A travis/setup-pgsql.sh
Diff:
diff --git a/.travis.yml b/.travis.yml
index d78b14e93dc..cbc75370fbb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,6 +51,7 @@ env:
- PDO_MYSQL_TEST_USER=travis
- PDO_MYSQL_TEST_PASS=
- PDO_MYSQL_TEST_HOST=127.0.0.1
+ - PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres
password="
- REPORT_EXIT_STATUS=1
matrix:
- ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
@@ -65,11 +66,8 @@ before_script:
# Compile PHP
- travis_wait ./travis/compile.sh
# 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
+ - ./travis/setup-mysql.sh
+ - ./travis/setup-pgsql.sh
# Run PHPs run-tests.php
script:
diff --git a/travis/ext/curl/setup.sh b/travis/ext/curl/setup.sh
deleted file mode 100755
index 02e8ce5bb88..00000000000
--- 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/mysql/setup.sh b/travis/ext/mysql/setup.sh
deleted file mode 100755
index a3ba75cb2d8..00000000000
--- a/travis/ext/mysql/setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-mysql -e "CREATE DATABASE IF NOT EXISTS test"
diff --git a/travis/ext/mysqli/setup.sh b/travis/ext/mysqli/setup.sh
deleted file mode 100755
index a3ba75cb2d8..00000000000
--- 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 a3ba75cb2d8..00000000000
--- 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 5f3cf67f921..00000000000
--- 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/pgsql/setup.sh b/travis/ext/pgsql/setup.sh
deleted file mode 100755
index 108f47db250..00000000000
--- a/travis/ext/pgsql/setup.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-echo '
-<?php $conn_str .= " user=postgres"; ?>' >>
"./ext/pgsql/tests/config.inc"
-psql -c 'create database test;' -U postgres
diff --git a/travis/setup-mysql.sh b/travis/setup-mysql.sh
new file mode 100755
index 00000000000..a3ba75cb2d8
--- /dev/null
+++ b/travis/setup-mysql.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+mysql -e "CREATE DATABASE IF NOT EXISTS test"
diff --git a/travis/setup-pgsql.sh b/travis/setup-pgsql.sh
new file mode 100755
index 00000000000..108f47db250
--- /dev/null
+++ b/travis/setup-pgsql.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