diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-30 11:37:07 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:17 +1000 |
| commit | 172b8c55f751c1f295dc75ae6143b158d6101228 (patch) | |
| tree | caffba6c06c810db0b995eb1c13570de91400060 /source4/selftest | |
| parent | 6c76919ab516f6145c85a3c4da5c6bfe4ab632bd (diff) | |
| download | samba-172b8c55f751c1f295dc75ae6143b158d6101228.tar.gz samba-172b8c55f751c1f295dc75ae6143b158d6101228.tar.bz2 samba-172b8c55f751c1f295dc75ae6143b158d6101228.zip | |
s4-waf: use the versions of perl/python found by configure
Diffstat (limited to 'source4/selftest')
| -rw-r--r-- | source4/selftest/wscript | 6 |
1 files changed, 2 insertions, 4 deletions
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' |