From 172b8c55f751c1f295dc75ae6143b158d6101228 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 30 Mar 2010 11:37:07 +1100 Subject: s4-waf: use the versions of perl/python found by configure --- source4/selftest/wscript | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source4/selftest') diff --git a/source4/selftest/wscript b/source4/selftest/wscript index 3ca03a5513..664061bcf1 100644 --- a/source4/selftest/wscript +++ b/source4/selftest/wscript @@ -3,7 +3,7 @@ # selftest main code. import Scripting, os, Options, Utils, Environment, optparse, sys -from samba_utils import RUN_COMMAND, ADD_LD_LIBRARY_PATH +from samba_utils import * def set_options(opt): opt.ADD_COMMAND('test', cmd_test) @@ -39,11 +39,9 @@ def set_options(opt): def cmd_testonly(opt): '''run tests without doing a build first''' - env = Environment.Environment() + env = LOAD_ENVIRONMENT() env.TESTS = Options.options.TESTS - env.PERL = 'perl' - env.PYTHON = 'python' env.SUBUNIT_FORMATTER = '${PERL} ../selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate' env.FILTER_XFAIL = '${PERL} ../selftest/filter-subunit.pl --expected-failures=./selftest/knownfail' -- cgit