derick                                   Sun, 05 Sep 2010 12:29:47 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=303053

Log:
- Clean up the generated tmp-php.ini after make test has run.

Changed paths:
    U   php/php-src/branches/PHP_5_3/Makefile.global
    U   php/php-src/trunk/Makefile.global

Modified: php/php-src/branches/PHP_5_3/Makefile.global
===================================================================
--- php/php-src/branches/PHP_5_3/Makefile.global        2010-09-05 09:59:08 UTC 
(rev 303052)
+++ php/php-src/branches/PHP_5_3/Makefile.global        2010-09-05 12:29:47 UTC 
(rev 303053)
@@ -98,6 +98,7 @@
                TEST_PHP_SRCDIR=$(top_srcdir) \
                CC="$(CC)" \
                        $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini 
$(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c 
$(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+               rm $(top_builddir)/tmp-php.ini; \
        else \
                echo "ERROR: Cannot run tests without CLI sapi."; \
        fi

Modified: php/php-src/trunk/Makefile.global
===================================================================
--- php/php-src/trunk/Makefile.global   2010-09-05 09:59:08 UTC (rev 303052)
+++ php/php-src/trunk/Makefile.global   2010-09-05 12:29:47 UTC (rev 303053)
@@ -98,6 +98,7 @@
                TEST_PHP_SRCDIR=$(top_srcdir) \
                CC="$(CC)" \
                        $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini 
$(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c 
$(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ 
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+               rm $(top_builddir)/tmp-php.ini; \
        else \
                echo "ERROR: Cannot run tests without CLI sapi."; \
        fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to