diff options
| author | Daniel Moody <dmoody256@gmail.com> | 2017-04-23 16:00:43 -0400 |
|---|---|---|
| committer | Daniel Moody <dmoody256@gmail.com> | 2017-04-23 16:00:43 -0400 |
| commit | 151cbcd4868c42fc8fc102ca17110f424208cdf1 (patch) | |
| tree | c8a0b519fe42ab079a419b880eae627f48c44772 | |
| parent | 26ed93ab719b54ec8fcf1bf31c307d3a34c0e403 (diff) | |
| download | scons-git-151cbcd4868c42fc8fc102ca17110f424208cdf1.tar.gz | |
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.
| -rw-r--r-- | test/scons-time/run/option/verbose.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/scons-time/run/option/verbose.py b/test/scons-time/run/option/verbose.py index 5fc6d64de..0ef2a6c8a 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) |