diff options
author | William Deegan <bill@baddogconsulting.com> | 2019-12-10 22:39:26 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-10 22:39:26 (GMT) |
commit | 516ba7c177f5aa179419c46e386ad30206a43759 (patch) | |
tree | 7938563069188c1825f4dc23f31bb5193c864551 /testing | |
parent | 1bb22663dd05fd6de2aa8a462e1fc695cb50de0a (diff) | |
parent | c09ac3c715cb18dc419d12c5bf90adb3019bede0 (diff) | |
download | SCons-516ba7c177f5aa179419c46e386ad30206a43759.zip SCons-516ba7c177f5aa179419c46e386ad30206a43759.tar.gz SCons-516ba7c177f5aa179419c46e386ad30206a43759.tar.bz2 |
Merge branch 'master' into topic/grossag/value
Diffstat (limited to 'testing')
-rw-r--r-- | testing/framework/TestCommon.py | 4 | ||||
-rw-r--r-- | testing/framework/test-framework.rst | 2 |
2 files changed, 3 insertions, 3 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/test-framework.rst b/testing/framework/test-framework.rst index cb6b8e1..24240ac 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), |