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

allow ignoring tests with IGNORETESTS

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5150 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
pabs3 2007-05-21 09:23:44 +00:00
parent 55d89deb99
commit cd72a50a07
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
SConstruct
View file

@ -134,6 +134,7 @@ opts.Add(ListOption('SKIPUTILS', 'A list of utilities that will not be built', '
opts.Add(ListOption('SKIPMISC', 'A list of plug-ins that will not be built', 'none', misc)) opts.Add(ListOption('SKIPMISC', 'A list of plug-ins that will not be built', 'none', misc))
opts.Add(ListOption('SKIPDOC', 'A list of doc files that will not be built/installed', 'none', doc)) opts.Add(ListOption('SKIPDOC', 'A list of doc files that will not be built/installed', 'none', doc))
opts.Add(('SKIPTESTS', 'A comma-separated list of test files that will not be ran', 'none')) opts.Add(('SKIPTESTS', 'A comma-separated list of test files that will not be ran', 'none'))
opts.Add(('IGNORETESTS', 'A comma-separated list of test files that will be ran but ignored', 'none'))
# build tools # build tools
opts.Add(('TOOLSET', 'A comma-separated list of specific tools used for building instead of the default', None)) opts.Add(('TOOLSET', 'A comma-separated list of specific tools used for building instead of the default', None))
opts.Add(BoolOption('MSTOOLKIT', 'Use Microsoft Visual C++ Toolkit', 'no')) opts.Add(BoolOption('MSTOOLKIT', 'Use Microsoft Visual C++ Toolkit', 'no'))
@ -670,16 +671,21 @@ def test_scripts(target, source, env):
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(',')
for root, dirs, files in walk(instdir): for root, dirs, files in walk(instdir):
for file in files: for file in files:
if file[-4:] == '.nsi': if file[-4:] == '.nsi':
nsi = root + sep + file nsi = root + sep + file
nsif = nsi[tdlen + 1:]
if nsi[tdlen + 1:] in skipped_tests: if nsif in skipped_tests:
continue continue
cmd = env.Command(None, nsi, '%s $SOURCE' % makensis) if nsif in ignored_tests:
cmd = env.Command(None, nsi, '-%s $SOURCE' % makensis)
else:
cmd = env.Command(None, nsi, '%s $SOURCE' % makensis)
AlwaysBuild(cmd) AlwaysBuild(cmd)
env.Alias('test-scripts', cmd) env.Alias('test-scripts', cmd)