s4-waf: use the versions of perl/python found by configure
authorAndrew Tridgell <tridge@samba.org>
Tue, 30 Mar 2010 00:37:07 +0000 (11:37 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 6 Apr 2010 10:27:17 +0000 (20:27 +1000)
source4/selftest/wscript

index 3ca03a5513a3b39b2e1420a244e8bb21c9348433..664061bcf147c55d3389774454ab327bfb072de3 100644 (file)
@@ -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'