diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-04-24 00:16:20 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-04-24 00:16:20 (GMT) |
| commit | 102361949a886e5bb45272849854845b08a4ab2a (patch) | |
| tree | fde63397554edc490cac0c3e051f70c027910ea6 | |
| parent | 8bf16ddea63ef3405bf00ba1fb26da0cd60b7b08 (diff) | |
| parent | 0c775f3836a7d9a20956004834c8576defbf532f (diff) | |
| download | SCons-102361949a886e5bb45272849854845b08a4ab2a.zip SCons-102361949a886e5bb45272849854845b08a4ab2a.tar.gz SCons-102361949a886e5bb45272849854845b08a4ab2a.tar.bz2 | |
Merged scons/scons into default
| -rw-r--r-- | QMTest/TestCmd.py | 2 | ||||
| -rw-r--r-- | src/CHANGES.txt | 6 | ||||
| -rw-r--r-- | test/scons-time/run/option/verbose.py | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py index 3b745f8..20f1f14 100644 --- a/QMTest/TestCmd.py +++ b/QMTest/TestCmd.py @@ -987,7 +987,7 @@ class TestCmd(object): condition = self.condition if self._preserve[condition]: for dir in self._dirlist: - print("Preserved directory " + dir + "\n") + print(u"Preserved directory " + dir + "\n") else: list = self._dirlist[:] list.reverse() diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 0bcf92e..9e6151a 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -13,6 +13,12 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER RELEASE VERSION/DATE TO BE FILLED IN LATER + From Daniel Moody: + - Updated the QMTest/TestCmd.py so when using the + preserve option, it will be able to print unicode directories. + - Also updated test/scons-time/run/option/verbose.py that was + not taking into account the output when PRESERVE was enabled + From Gaurav Juvekar: - Fix issue #2910: Make --tree=all handle Unicode. (PR #427) - Fix issue #2788: Fix typo in documentation example for sconf. (PR #388) diff --git a/test/scons-time/run/option/verbose.py b/test/scons-time/run/option/verbose.py index 5fc6d64..0ef2a6c 100644 --- a/test/scons-time/run/option/verbose.py +++ b/test/scons-time/run/option/verbose.py @@ -30,7 +30,7 @@ Verify that the run -v and --verbose options display command output. import sys import re - +import os import TestSCons_time _python_ = re.escape('"' + sys.executable + '"') @@ -112,7 +112,9 @@ scons-time%(time_re)s: %(_python_)s %(scons_py)s %(scons_flags)s --profile=%(pro SCONS_LIB_DIR = %(src_engine)s SConstruct file directory: %(tmp_scons_time_foo)s scons-time%(time_re)s: cd .* -scons-time%(time_re)s: rm -rf %(tmp_scons_time)s +""" +if 'PRESERVE' not in os.environ or not os.environ['PRESERVE']: + expect += """scons-time%(time_re)s: rm -rf %(tmp_scons_time)s """ foo_tar_gz = re.escape(foo_tar_gz) |