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

Ignore some failing tests by default on platforms without msvc/mstoolkit

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5236 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
pabs3 2007-08-14 01:11:54 +00:00
parent 20137a0054
commit 7d17167053
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
SConstruct
View file

@ -127,6 +127,25 @@ if 'NSIS_CONFIG_CONST_DATA_PATH' in defenv['NSIS_CPPDEFINES']:
else:
dirs = install_dirs['relocatable']
if 'msvc' in defenv['TOOLS'] or 'mstoolkit' in defenv['TOOLS']:
ignore_tests = 'none'
else:
ignore_tests = ','.join(Split("""
Examples/System/System.nsi
Examples/LogicLib.nsi
Examples/StrFunc.nsi
Examples/TextFunc.nsi
Examples/TextFuncTest.nsi
Examples/FileFunc.nsi
Examples/FileFuncTest.nsi
Examples/Library.nsi
Examples/makensis.nsi
Examples/gfx.nsi
Examples/nsDialogs/example.nsi
Examples/nsDialogs/InstallOptions.nsi
Examples/nsDialogs/welcome.nsi
"""))
# version
opts.Add(('VERSION', 'Version of NSIS', cvs_version))
opts.Add(('VER_MAJOR', 'Major version of NSIS (recommended for dist-installer)', None))
@ -141,7 +160,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('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(('IGNORETESTS', 'A comma-separated list of test files that will be ran but ignored', 'none'))
opts.Add(('IGNORETESTS', 'A comma-separated list of test files that will be ran but ignored', ignore_tests))
# build tools
opts.Add(('PATH', 'A colon-separated list of system paths instead of the default - TEMPORARY AND MAY DEPRECATE', None))
opts.Add(('TOOLSET', 'A comma-separated list of specific tools used for building instead of the default', None))