diff options
| author | Stefan Zimmermann <zimmermann.code@gmail.com> | 2014-03-31 16:24:42 (GMT) |
|---|---|---|
| committer | Stefan Zimmermann <zimmermann.code@gmail.com> | 2014-03-31 16:24:42 (GMT) |
| commit | cffcd3c38568d3f82ff83916bbbd1b129373558c (patch) | |
| tree | ff268c97886e3cc905115185a35405b3fd83348a /src/engine/SCons/Platform | |
| parent | ea1890249923aab9cda388b2d22b566dbb7b8949 (diff) | |
| parent | d4f8c6e320484c106446918c37affdddacd5c7a3 (diff) | |
| download | SCons-cffcd3c38568d3f82ff83916bbbd1b129373558c.zip SCons-cffcd3c38568d3f82ff83916bbbd1b129373558c.tar.gz SCons-cffcd3c38568d3f82ff83916bbbd1b129373558c.tar.bz2 | |
Merged with [default]
Diffstat (limited to 'src/engine/SCons/Platform')
| -rw-r--r-- | src/engine/SCons/Platform/PlatformTests.py | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/__init__.xml | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/posix.xml | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/sunos.xml | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/win32.xml | 4 |
5 files changed, 11 insertions, 10 deletions
diff --git a/src/engine/SCons/Platform/PlatformTests.py b/src/engine/SCons/Platform/PlatformTests.py index 6841272..515382a 100644 --- a/src/engine/SCons/Platform/PlatformTests.py +++ b/src/engine/SCons/Platform/PlatformTests.py @@ -29,6 +29,8 @@ import collections import sys import unittest +import TestUnit + import SCons.Errors import SCons.Platform @@ -118,8 +120,7 @@ class PlatformTestCase(unittest.TestCase): if __name__ == "__main__": suite = unittest.makeSuite(PlatformTestCase, 'test_') - if not unittest.TextTestRunner().run(suite).wasSuccessful(): - sys.exit(1) + TestUnit.run(suite) # Local Variables: # tab-width:4 diff --git a/src/engine/SCons/Platform/__init__.xml b/src/engine/SCons/Platform/__init__.xml index d95d11d..0802369 100644 --- a/src/engine/SCons/Platform/__init__.xml +++ b/src/engine/SCons/Platform/__init__.xml @@ -21,7 +21,7 @@ See its __doc__ string for a discussion of the format. <sconsdoc xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0/scons.xsd scons.xsd"> + xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd"> <cvar name="ESCAPE"> <summary> @@ -241,4 +241,4 @@ or '-via' for ARM toolchain. </summary> </cvar> -</sconsdoc>
\ No newline at end of file +</sconsdoc> diff --git a/src/engine/SCons/Platform/posix.xml b/src/engine/SCons/Platform/posix.xml index 8bdaa5d..e96dd63 100644 --- a/src/engine/SCons/Platform/posix.xml +++ b/src/engine/SCons/Platform/posix.xml @@ -21,7 +21,7 @@ See its __doc__ string for a discussion of the format. <sconsdoc xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0/scons.xsd scons.xsd"> + xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd"> <cvar name="RPATH"> <summary> @@ -77,4 +77,4 @@ when the &cv-_RPATH; variable is automatically generated. </summary> </cvar> -</sconsdoc>
\ No newline at end of file +</sconsdoc> diff --git a/src/engine/SCons/Platform/sunos.xml b/src/engine/SCons/Platform/sunos.xml index 7b2f25f..4921f4c 100644 --- a/src/engine/SCons/Platform/sunos.xml +++ b/src/engine/SCons/Platform/sunos.xml @@ -21,7 +21,7 @@ See its __doc__ string for a discussion of the format. <sconsdoc xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0/scons.xsd scons.xsd"> + xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd"> <cvar name="PKGCHK"> @@ -52,4 +52,4 @@ The default is </summary> </cvar> -</sconsdoc>
\ No newline at end of file +</sconsdoc> diff --git a/src/engine/SCons/Platform/win32.xml b/src/engine/SCons/Platform/win32.xml index 472797b..ca6dc4d 100644 --- a/src/engine/SCons/Platform/win32.xml +++ b/src/engine/SCons/Platform/win32.xml @@ -21,7 +21,7 @@ See its __doc__ string for a discussion of the format. <sconsdoc xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0/scons.xsd scons.xsd"> + xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd"> <cvar name="MAXLINELENGTH"> <summary> @@ -34,4 +34,4 @@ are linked via a temporary file name. </summary> </cvar> -</sconsdoc>
\ No newline at end of file +</sconsdoc> |