Browse Source

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

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@831 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 9 years ago
parent
commit
8eeae065ec
  1. 5
      Makefile.frag
  2. 3
      run-xcachetest

5
Makefile.frag

@ -40,8 +40,7 @@ xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xc_shm.h $(srcdir)/stack.h $(srcdir)/xcach
xcachesvnclean: clean
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

3
run-xcachetest

@ -33,4 +33,5 @@ echo "XCache test running with:"
echo "TEST_PHP_CGI_EXECUTABLE: $TEST_PHP_CGI_EXECUTABLE"
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 "$@"
Loading…
Cancel
Save