dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix Library.nsi test by adding the test directory to PATH so it can run LibraryLocal

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5933 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
pabs3 2009-02-05 07:26:16 +00:00
parent 1c87c9a018
commit b016a4402c
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
SConstruct
View file

@ -680,14 +680,13 @@ defenv.Ignore('$BUILD_PREFIX', '$BUILD_PREFIX/tests')
test_scripts_env = defenv.Clone(ENV = os.environ) # env needed for some scripts test_scripts_env = defenv.Clone(ENV = os.environ) # env needed for some scripts
test_scripts_env['ENV']['NSISDIR'] = os.path.abspath(str(defenv['TESTDISTDIR'])) test_scripts_env['ENV']['NSISDIR'] = os.path.abspath(str(defenv['TESTDISTDIR']))
test_scripts_env['ENV']['NSISCONFDIR'] = os.path.abspath(str(defenv['TESTDISTDIR'])) test_scripts_env['ENV']['NSISCONFDIR'] = os.path.abspath(str(defenv['TESTDISTDIR']))
test_scripts_env.PrependENVPath('PATH', os.path.abspath(str(defenv['TESTDISTDIR'])))
def test_scripts(target, source, env): def test_scripts(target, source, env):
from os import walk, sep from os import walk, sep
instdir = source[0].path instdir = source[0].path
makensis = instdir + sep + 'makensis'
tdlen = len(env.subst('$TESTDISTDIR')) tdlen = len(env.subst('$TESTDISTDIR'))
skipped_tests = env['SKIPTESTS'].split(',') skipped_tests = env['SKIPTESTS'].split(',')
ignored_tests = env['IGNORETESTS'].split(',') ignored_tests = env['IGNORETESTS'].split(',')
@ -702,9 +701,9 @@ def test_scripts(target, source, env):
continue continue
if nsif in ignored_tests: if nsif in ignored_tests:
cmd = env.Command(None, nsi, '-%s $SOURCE' % makensis) cmd = env.Command(None, nsi, '-makensis $SOURCE')
else: else:
cmd = env.Command(None, nsi, '%s $SOURCE' % makensis) cmd = env.Command(None, nsi, 'makensis $SOURCE')
AlwaysBuild(cmd) AlwaysBuild(cmd)
env.Alias('test-scripts', cmd) env.Alias('test-scripts', cmd)