From b016a4402c57c011f7655abf3a6d050b4d991ec1 Mon Sep 17 00:00:00 2001 From: pabs3 Date: Thu, 5 Feb 2009 07:26:16 +0000 Subject: [PATCH] fix Library.nsi test by adding the test directory to PATH so it can run LibraryLocal git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5933 212acab6-be3b-0410-9dea-997c60f758d6 --- SConstruct | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 510b5f47..75622bce 100644 --- a/SConstruct +++ b/SConstruct @@ -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['ENV']['NSISDIR'] = 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): from os import walk, sep instdir = source[0].path - makensis = instdir + sep + 'makensis' - tdlen = len(env.subst('$TESTDISTDIR')) skipped_tests = env['SKIPTESTS'].split(',') ignored_tests = env['IGNORETESTS'].split(',') @@ -702,9 +701,9 @@ def test_scripts(target, source, env): continue if nsif in ignored_tests: - cmd = env.Command(None, nsi, '-%s $SOURCE' % makensis) + cmd = env.Command(None, nsi, '-makensis $SOURCE') else: - cmd = env.Command(None, nsi, '%s $SOURCE' % makensis) + cmd = env.Command(None, nsi, 'makensis $SOURCE') AlwaysBuild(cmd) env.Alias('test-scripts', cmd)