summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-12-29 15:50:38 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-12-29 15:50:38 +0100
commitc7ed3af5765539e212ecd5f93bd7ea5f9785bc25 (patch)
tree586ea369a93cb817c45c47dc2609ab58648f94ab /testing
parentc7665433b2004d2b404d6fb9d6fd064998486f63 (diff)
parente2cfc8f485631bfd5f61d4af1921c7346a062875 (diff)
Merge branch 'release/debian/3.1.2+repack-1'debian/3.1.2+repack-1
Diffstat (limited to 'testing')
-rw-r--r--testing/framework/README.txt2
-rw-r--r--testing/framework/TestCmd.py2
-rw-r--r--testing/framework/TestCommon.py4
-rw-r--r--testing/framework/TestRuntest.py2
-rw-r--r--testing/framework/TestSCons.py6
-rw-r--r--testing/framework/TestSConsMSVS.py2
-rw-r--r--testing/framework/TestSCons_time.py21
-rw-r--r--testing/framework/TestSConsign.py2
-rw-r--r--testing/framework/test-framework.rst2
9 files changed, 12 insertions, 31 deletions
diff --git a/testing/framework/README.txt b/testing/framework/README.txt
index 817cb3f..8909f11 100644
--- a/testing/framework/README.txt
+++ b/testing/framework/README.txt
@@ -47,4 +47,4 @@ the pieces here are local to SCons.
Test infrastructure for the sconsign.py script.
Copyright (c) 2001 - 2019 The SCons Foundation
-testing/framework/README.txt e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan
+testing/framework/README.txt bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan
diff --git a/testing/framework/TestCmd.py b/testing/framework/TestCmd.py
index 81e03f3..9218f60 100644
--- a/testing/framework/TestCmd.py
+++ b/testing/framework/TestCmd.py
@@ -1528,7 +1528,7 @@ class TestCmd(object):
# TODO: Run full tests on both platforms and see if this fixes failures
# It seems that py3.6 still sets text mode if you set encoding.
elif sys.version_info[0] == 3: # TODO and sys.version_info[1] < 6:
- stream = stream.decode('utf-8')
+ stream = stream.decode('utf-8', errors='replace')
stream = stream.replace('\r\n', '\n')
elif sys.version_info[0] == 2:
stream = stream.replace('\r\n', '\n')
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/TestRuntest.py b/testing/framework/TestRuntest.py
index e9ca524..a86ce67 100644
--- a/testing/framework/TestRuntest.py
+++ b/testing/framework/TestRuntest.py
@@ -14,7 +14,7 @@ attributes defined in this subclass.
# Copyright (c) 2001 - 2019 The SCons Foundation
-__revision__ = "testing/framework/TestRuntest.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
+__revision__ = "testing/framework/TestRuntest.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py
index 2228423..4543c5b 100644
--- a/testing/framework/TestSCons.py
+++ b/testing/framework/TestSCons.py
@@ -15,7 +15,7 @@ attributes defined in this subclass.
# Copyright (c) 2001 - 2019 The SCons Foundation
from __future__ import division, print_function
-__revision__ = "testing/framework/TestSCons.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
+__revision__ = "testing/framework/TestSCons.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import re
@@ -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.0'
+default_version = '3.1.2'
python_version_unsupported = (2, 6, 0)
python_version_deprecated = (2, 7, 0)
@@ -44,7 +44,7 @@ python_version_deprecated = (2, 7, 0)
# line must remain "__ VERSION __" (without the spaces) so the built
# version in build/testing/framework/TestSCons.py contains the actual version
# string of the packages that have been built.
-SConsVersion = '3.1.0'
+SConsVersion = '3.1.2'
if SConsVersion == '__' + 'VERSION' + '__':
SConsVersion = default_version
diff --git a/testing/framework/TestSConsMSVS.py b/testing/framework/TestSConsMSVS.py
index 86935fd..0eeed69 100644
--- a/testing/framework/TestSConsMSVS.py
+++ b/testing/framework/TestSConsMSVS.py
@@ -15,7 +15,7 @@ in this subclass.
# Copyright (c) 2001 - 2019 The SCons Foundation
-__revision__ = "testing/framework/TestSConsMSVS.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
+__revision__ = "testing/framework/TestSConsMSVS.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import sys
diff --git a/testing/framework/TestSCons_time.py b/testing/framework/TestSCons_time.py
index 547e264..63f1035 100644
--- a/testing/framework/TestSCons_time.py
+++ b/testing/framework/TestSCons_time.py
@@ -13,7 +13,7 @@ attributes defined in this subclass.
# Copyright (c) 2001 - 2019 The SCons Foundation
-__revision__ = "testing/framework/TestSCons_time.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
+__revision__ = "testing/framework/TestSCons_time.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
@@ -55,19 +55,6 @@ with open('SConstruct', 'r') as f:
exec(script)
"""
-aegis_py = """\
-#!/usr/bin/env python
-import os
-import sys
-
-script_dir = 'src/script'
-if not os.path.exists(script_dir):
- os.makedirs(script_dir)
-with open(script_dir + '/scons.py', 'w') as f:
- f.write(r'''%s''')
-""" % scons_py
-
-
svn_py = """\
#!/usr/bin/env python
import os
@@ -243,12 +230,6 @@ class TestSCons_time(TestCommon):
x = x.replace('time\\-', 'time\\-[^%s]*' % sep)
return x
- def write_fake_aegis_py(self, name):
- name = self.workpath(name)
- self.write(name, aegis_py)
- os.chmod(name, 0o755)
- return name
-
def write_fake_scons_py(self):
self.subdir('src', ['src', 'script'])
self.write('src/script/scons.py', scons_py)
diff --git a/testing/framework/TestSConsign.py b/testing/framework/TestSConsign.py
index 8f992ef..6ec6825 100644
--- a/testing/framework/TestSConsign.py
+++ b/testing/framework/TestSConsign.py
@@ -1,7 +1,7 @@
# Copyright (c) 2001 - 2019 The SCons Foundation
from __future__ import print_function
-__revision__ = "testing/framework/TestSConsign.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
+__revision__ = "testing/framework/TestSConsign.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """
TestSConsign.py: a testing framework for the "sconsign" script
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),