From 1ade2aff0865940aaea2aef67c10b5bd7d592394 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 28 Oct 2011 09:37:40 +0200
Subject: [PATCH] Allow having perl and python binaries in arbitrary paths (for
 testsuite)

---
 test/Makefile.inc | 2 +-
 test/dotests.pl   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/Makefile.inc b/test/Makefile.inc
index 24588015f..b9bb6fe3a 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -71,7 +71,7 @@ gen: refs $(SWFS) gen-php gen-pl gen-py gen-cxx gen-tcl
 
 .PHONY: dotests 
 dotests: $(top_srcdir)/test/dotests.pl
-	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" > $@
+	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" > $@
 	chmod +x $@
 
 .php.phpx:
diff --git a/test/dotests.pl b/test/dotests.pl
index 6db0dd37b..11357af14 100755
--- a/test/dotests.pl
+++ b/test/dotests.pl
@@ -149,12 +149,12 @@ ($$$$)
 				chop;
 				$ENV{'PYTHONPATH'} .= ":".$_;
 			}
+			$testbuilder = "$ENV{'PYTHON'} $testbuilder";
 		}
 
 		elsif($binding eq 'php')
 		{
-			# TODO: have the .phpx file passed instead !
-			$testbuilder = "php -n -d extension_dir=$TOP_BUILDDIR/php_ext/.libs -d extension=ming.so $testbuilder";
+			$testbuilder = "$ENV{'PHP'} -n -d extension_dir=$TOP_BUILDDIR/php_ext/.libs -d extension=ming.so $testbuilder";
 		}
 
 		elsif($binding eq 'perl')
@@ -162,6 +162,7 @@ ($$$$)
 			# Set the proper PERL5LIB
 			# (BUILDDIR contains both SWF.pm and SWF.so)
 			$ENV{'PERL5LIB'}=$TOP_BUILDDIR."/perl_ext/blib/arch/auto/SWF/:".$TOP_BUILDDIR."/perl_ext/blib/lib";
+			$testbuilder = "$ENV{'PERL'} $testbuilder";
 		}
 	}
 	else