diff options
| author | Adam Gross <grossag@gmail.com> | 2019-12-17 23:25:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 23:25:39 (GMT) |
| commit | 80ea14cad9e80a36c02f758f3ebf584f552c5cbc (patch) | |
| tree | f52023fed956aa47b7b985e7b34078789146c6d9 /testing | |
| parent | 1098fdbdd9bba34baaf25266e4f4e7166d17ac68 (diff) | |
| parent | 06fecd6362d691d16d9ad8347dd85ca7726a4d71 (diff) | |
| download | SCons-80ea14cad9e80a36c02f758f3ebf584f552c5cbc.zip SCons-80ea14cad9e80a36c02f758f3ebf584f552c5cbc.tar.gz SCons-80ea14cad9e80a36c02f758f3ebf584f552c5cbc.tar.bz2 | |
Merge branch 'master' into topic/grossag/pythonscanner
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/framework/TestCommon.py | 4 | ||||
| -rw-r--r-- | testing/framework/TestSCons.py | 2 | ||||
| -rw-r--r-- | testing/framework/test-framework.rst | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/testing/framework/TestCommon.py b/testing/framework/TestCommon.py index ca4a147..8e6cc8e 100644 --- a/testing/framework/TestCommon.py +++ b/testing/framework/TestCommon.py @@ -165,8 +165,8 @@ elif sys.platform.find('darwin') != -1: elif sys.platform.find('sunos') != -1: exe_suffix = '' obj_suffix = '.o' - shobj_suffix = '.o' - shobj_prefix = 'so_' + shobj_suffix = '.pic.o' + shobj_prefix = '' lib_prefix = 'lib' lib_suffix = '.a' dll_prefix = 'lib' diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index 7dc9e74..d1aed28 100644 --- a/testing/framework/TestSCons.py +++ b/testing/framework/TestSCons.py @@ -35,7 +35,7 @@ from TestCmd import PIPE # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '3.1.1' +default_version = '3.1.2' python_version_unsupported = (2, 6, 0) python_version_deprecated = (2, 7, 0) diff --git a/testing/framework/test-framework.rst b/testing/framework/test-framework.rst index dc6b2aa..a0fe861 100644 --- a/testing/framework/test-framework.rst +++ b/testing/framework/test-framework.rst @@ -29,7 +29,7 @@ There are three types of SCons tests: ``src/engine/`` subdirectory and are the same base name as the module to be tests, with ``Tests`` appended before the ``.py``. For example, the unit tests for the ``Builder.py`` module are in the - ``BuilderTests.py`` script. Unit tests tend to be based on assertions. + ``BuilderTests.py`` script. Unit tests tend to be based on assertions. *External Tests* For the support of external Tools (in the form of packages, preferably), |