summaryrefslogtreecommitdiff
path: root/test/scons-time
diff options
context:
space:
mode:
authorDaniel Moody <dmoody256@gmail.com>2017-04-23 16:00:43 -0400
committerDaniel Moody <dmoody256@gmail.com>2017-04-23 16:00:43 -0400
commit9412b26b7029985028b4bf392655d885ee684372 (patch)
treec8a0b519fe42ab079a419b880eae627f48c44772 /test/scons-time
parent30ed67d975f41f177a244d9851509ea8611bd03a (diff)
downloadscons-9412b26b7029985028b4bf392655d885ee684372.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.
Diffstat (limited to 'test/scons-time')
-rw-r--r--test/scons-time/run/option/verbose.py6
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 5fc6d64d..0ef2a6c8 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)