From bb04d9ccdacdc5f4d7e35d096889dfc23748631e Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sun, 23 Apr 2017 15:26:25 -0400 Subject: Test is failing on Windows 7 and Linux when PRESERVE is used. dirlist is saved as unicode, so printing it must also be unicode. Tested with py2 and py3. --- QMTest/TestCmd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() -- cgit v0.12 From 26ed93ab719b54ec8fcf1bf31c307d3a34c0e403 Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sun, 23 Apr 2017 15:32:01 -0400 Subject: Updates CHANGES.txt with changes. --- src/CHANGES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 0bcf92e..5ec4cd5 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -13,6 +13,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER RELEASE VERSION/DATE TO BE FILLED IN LATER + From Daniel Moody: + - Updated the src/engine/SCons/SConfTest.py so when using the + preserve option, it will be able to print unicode directories. + 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) -- cgit v0.12 From 151cbcd4868c42fc8fc102ca17110f424208cdf1 Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sun, 23 Apr 2017 16:00:43 -0400 Subject: This test is not account for PRESERVE being set. When preserve is set the rm command does not happen, so this output will fail. Tested py2 and py3. --- test/scons-time/run/option/verbose.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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) -- cgit v0.12 From f8899e92a97177e794aecadcd1f7fcce88b547d0 Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sun, 23 Apr 2017 16:02:57 -0400 Subject: Updated CHANGES.txt with some more info because it was related, adn should be in the same pull request. --- src/CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 5ec4cd5..766c7d0 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -16,6 +16,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER From Daniel Moody: - Updated the src/engine/SCons/SConfTest.py so when using the preserve option, it will be able to print unicode directories. + - Also updated a few test that were not taking into account PRESERVE From Gaurav Juvekar: - Fix issue #2910: Make --tree=all handle Unicode. (PR #427) -- cgit v0.12 From 0c775f3836a7d9a20956004834c8576defbf532f Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sun, 23 Apr 2017 16:07:43 -0400 Subject: updated CHANGES.txt so it was more clear --- src/CHANGES.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 766c7d0..9e6151a 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -14,9 +14,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER RELEASE VERSION/DATE TO BE FILLED IN LATER From Daniel Moody: - - Updated the src/engine/SCons/SConfTest.py so when using the + - Updated the QMTest/TestCmd.py so when using the preserve option, it will be able to print unicode directories. - - Also updated a few test that were not taking into account PRESERVE + - 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) -- cgit v0.12