Skip to content
This repository
  • 2 commits
  • 3 files changed
  • 0 comments
  • 1 contributor

Showing 3 changed files with 7 additions and 6 deletions. Show diff stats Hide diff stats

  1. +2 0  NEWS
  2. +1 1  test/Makefile.inc
  3. +4 5 test/dotests.pl
2  NEWS
... ... @@ -1,6 +1,8 @@
1 1 0.4.5 - ????-??-??
2 2
3 3 * Include test file missing in 0.4.4 (Oops)
  4 + * Ensure perl tests use uninstalled package
  5 + * Allow running testsuite with interpreters in custom paths
4 6
5 7 0.4.4 - 2011-10-26
6 8
2  test/Makefile.inc
@@ -71,7 +71,7 @@ gen: refs $(SWFS) gen-php gen-pl gen-py gen-cxx gen-tcl
71 71
72 72 .PHONY: dotests
73 73 dotests: $(top_srcdir)/test/dotests.pl
74   - echo "top_builddir=$(top_builddir) builddir=$(PWD) top_srcdir=$(top_srcdir) srcdir=$(srcdir) BINDINGS='$(BINDINGS)' BUILD_OPTIONS='$(BUILD_OPTIONS)' $(PERL) -w $(top_srcdir)/test/dotests.pl" > $@
  74 + echo "top_builddir=$(top_builddir) builddir=$(PWD) top_srcdir=$(top_srcdir) srcdir=$(srcdir) BINDINGS='$(BINDINGS)' BUILD_OPTIONS='$(BUILD_OPTIONS)' PERL='$(PERL)' PYTHON='$(PYTHON)' PHP='$(PHP)' $(PERL) -w $(top_srcdir)/test/dotests.pl" > $@
75 75 chmod +x $@
76 76
77 77 .php.phpx:
9 test/dotests.pl
@@ -149,19 +149,18 @@ ($$$$)
149 149 chop;
150 150 $ENV{'PYTHONPATH'} .= ":".$_;
151 151 }
  152 + $testbuilder = "$ENV{'PYTHON'} $testbuilder";
152 153 }
153 154
154 155 elsif($binding eq 'php')
155 156 {
156   - # TODO: have the .phpx file passed instead !
157   - $testbuilder = "php -n -d extension_dir=$TOP_BUILDDIR/php_ext/.libs -d extension=ming.so $testbuilder";
  157 + $testbuilder = "$ENV{'PHP'} -n -d extension_dir=$TOP_BUILDDIR/php_ext/.libs -d extension=ming.so $testbuilder";
158 158 }
159 159
160 160 elsif($binding eq 'perl')
161 161 {
162   - # Set the proper PERL5LIB
163   - # (BUILDDIR contains both SWF.pm and SWF.so)
164   - $ENV{'PERL5LIB'}=$TOP_BUILDDIR."/perl_ext/blib/arch/auto/SWF/:".$TOP_BUILDDIR."/perl_ext/blib/lib";
  162 + # Set the proper blib path
  163 + $testbuilder = "$ENV{'PERL'} -w -Mblib='${TOP_BUILDDIR}/perl_ext/blib' $testbuilder";
165 164 }
166 165 }
167 166 else

No commit comments for this range

Something went wrong with that request. Please try again.