Changeset 831

Timestamp:

03/23/2012 05:16:19 PM (14 months ago)

Author:

moo

Message:

fix test running for devel. redirect uses DIR so run-tests.php has to the one under php-src/

Location:

trunk

Files:

• Makefile.frag (modified) (1 diff)
• run-xcachetest (modified) (1 diff)

trunk/Makefile.frag

@@ -41 +41 @@
     cat $(srcdir)/.cvsignore | grep -v ^Makefile | grep -v ^config.nice | xargs rm -rf
 
-xcachetest:
+xcachetest: all
     $(SED) "s#\\./modules/#$(top_builddir)/modules/#" < $(srcdir)/xcache-test.ini > $(top_builddir)/tmp-php.ini
-    TEST_PHP_SRCDIR=$(top_srcdir) \
     CC="$(CC)" \
-        $(srcdir)/run-xcachetest -d "open_basedir=" -d "safe_mode=0" -d "output_buffering=0" -d "memory_limit=-1" $(top_srcdir)/run-tests.php $(TESTS) $(TEST_ARGS) -c $(top_builddir)/tmp-php.ini
+        $(srcdir)/run-xcachetest $(TESTS) $(TEST_ARGS) -c $(top_builddir)/tmp-php.ini

trunk/run-xcachetest

@@ -34 +34 @@
 echo "TEST_PHP_EXECUTABLE:     $TEST_PHP_EXECUTABLE"
 
-exec "$php_cli" "$@"
+run_tests_php=$TEST_PHP_SRCDIR/run-tests.php
+exec "$php_cli" -d "open_basedir=" -d "safe_mode=0" -d "output_buffering=0" -d "memory_limit=-1" $run_tests_php "$@"