Re: Re: cvs: php-src(PHP_5_2) / Makefile.global

Solved now in CVS. I could have done this without adding a php function for pulling out the php.ini path in use but it was easier. :D --Jani Jani Taskinen kirjoitti:

You're right, let's keep it simple. Your suggestion of making a modified copy of php.ini sounds pretty good idea to me. It solves the issue of extensions not build also..any other solution would mean changing the ini code.. :) I'll try to fix this today. --Jani Dmitry Stogov kirjoitti:

I don't like modify PHP code to support duplicate "extension" directives, especialy because this won't solve problem with extension in php.ini that weren't build. I see a simple workaround, but I afraid that it may bring other trubles. We can make copy of php.ini without "extension" directives and then use it instead of original one. $ grep -v '^extension=' php.ini tmp-php.ini Thanks. Dmitry.

-----Original Message----- From: Jani Taskinen [mailto:jani.taskinen@sci.fi] Sent: Thursday, June 07, 2007 3:35 PM To: Dmitry Stogov Subject: RE: [PHP-CVS] cvs: php-src(PHP_5_2) / Makefile.global After some digging I think I found the perfect solution. Since it's about testing what you just build, how about just not adding duplicate entries in main/php_ini.c:183 ? Or do some cleanup before the extension_lists.functions llist is used? (remove duplicate entries?).. After all, it only matters if the extension is build. You have more troubles if it isn't anyway..and it won't find the extensions anyway if you haven't build them since we change extension_dir to point to $(top_builddir)/modules/ --Jani On Thu, 2007-06-07 at 11:27 +0400, Dmitry Stogov wrote:

Hi Jani, After this patch all my tests failed, because PHP tries to load extensions twice. First from php.ini and then from command line (-d extension=...). I like your idea, as it's going to allow testing of ALL compileed extensions before installation, but it doesn't work yet. Thanks. Dmitry.

-----Original Message----- From: Jani Taskinen [mailto:sniper@php.net] Sent: Wednesday, June 06, 2007 10:28 PM To: php-cvs@lists.php.net Subject: [PHP-CVS] cvs: php-src(PHP_5_2) / Makefile.global

sniper        Wed Jun  6 18:28:14 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    Makefile.global   Log:

MFH:- Fix passing of shared extensions to run-tests.php http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.57. 2.5.2.2&r2=1.57.2.5.2.3&diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.57.2.5.2.2 php-src/Makefile.global:1.57.2.5.2.3

--- php-src/Makefile.global:1.57.2.5.2.2    Wed Apr 11 16:03:06 2007
+++ php-src/Makefile.global    Wed Jun  6 18:28:13 2007

@@ -69,22 +69,26 @@

     install-su: install-pear
 +PHP_TEST_SHARED_EXTENSIONS=`(for i in $(PHP_MODULES); do .

$$i ; echo +-n "-d extension=$$dlname "; done)` PHP_TEST_SETTINGS=-d +'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d +'memory_limit=-1' +

 test: all      -@if test ! -z "$(PHP_EXECUTABLE)" && test -x

"$(PHP_EXECUTABLE)"; then \

         TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
         TEST_PHP_SRCDIR=$(top_srcdir) \
         CC="$(CC)" \
-            $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
+            $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS)

$(top_srcdir)/run-tests.php +-d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \

     elif test ! -z "$(SAPI_CLI_PATH)" && test -x

"$(SAPI_CLI_PATH)"; then \

         TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
         TEST_PHP_SRCDIR=$(top_srcdir) \
         CC="$(CC)" \
-            $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \
+            $(top_builddir)/$(SAPI_CLI_PATH)

$(PHP_TEST_SETTINGS) +$(top_srcdir)/run-tests.php -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \

     else \
         echo "ERROR: Cannot run tests without CLI sapi."; \
     fi
  clean:
+    find . -name \*.gcno -o -name \*.gcda | xargs rm -f
     find . -name \*.lo -o -name \*.o | xargs rm -f
     find . -name \*.la -o -name \*.a | xargs rm -f      find . -name \*.so | xargs rm -f

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