diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-09-22 10:20:01 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-09-22 10:20:01 +0200 |
| commit | 64fcfe7ae2f3ed87088d22db5e4c899ad5718320 (patch) | |
| tree | 35f45433400f612d7a654a1c4e66af88d5e42442 | |
| parent | 2caa8e205ac3ab38ee91d176fe49f349b3e1a5ca (diff) | |
php-pecl-mysql: improve previous
| -rw-r--r-- | php-pecl-mysql.spec | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/php-pecl-mysql.spec b/php-pecl-mysql.spec index 7e3c418..2fad6e2 100644 --- a/php-pecl-mysql.spec +++ b/php-pecl-mysql.spec @@ -217,7 +217,6 @@ while [ $n -gt 0 ]; do sleep 1 done -if [ -f $MYSQL_PID_FILE ]; then : Run upstream test suite sed -e "s/localhost/$MYSQL_TEST_HOST/;s/3306/$MYSQL_TEST_PORT/" -i tests/connect.inc @@ -226,15 +225,17 @@ rm tests/bug55473.phpt rm tests/mysql_pconn_max_links.phpt rm tests/mysql_query_load_data_openbasedir.phpt - +if [ $n -gt 0 ]; then TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=mysqlnd.so -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{__php} -n run-tests.php --show-diff || RET=1 +fi : Cleanup -kill $(cat $MYSQL_PID_FILE) +if [ -s $MYSQL_PID_FILE ]; then + kill $(cat $MYSQL_PID_FILE) fi exit $RET |