diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/Builder/multi/same-overrides.py | 4 | ||||
-rw-r--r-- | test/VariantDir/reflect.py | 8 | ||||
-rw-r--r-- | test/scons-time/run/option/verbose.py | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/test/Builder/multi/same-overrides.py b/test/Builder/multi/same-overrides.py index 9a428a2..707a7e7 100644 --- a/test/Builder/multi/same-overrides.py +++ b/test/Builder/multi/same-overrides.py @@ -54,8 +54,8 @@ env.B(target = 'file4.out', source = 'file4b.in', foo=3) test.write('file4a.in', 'file4a.in\n') test.write('file4b.in', 'file4b.in\n') -python_expr = TestSCons.python.replace('\\', '\\\\') -act = TestSCons.re_escape('"%s" build.py \$foo \$TARGET \$SOURCES' % python_expr) +python_expr = _python_.replace('\\', '\\\\') +act = TestSCons.re_escape('%s build.py \$foo \$TARGET \$SOURCES' % python_expr) expect = (""" scons: warning: Two different environments were specified for target file4.out, diff --git a/test/VariantDir/reflect.py b/test/VariantDir/reflect.py index 51a1bc8..e7ff6db 100644 --- a/test/VariantDir/reflect.py +++ b/test/VariantDir/reflect.py @@ -90,9 +90,9 @@ INC_CNI = re.escape(os.path.join('INC_dir1', 'dir2', 'dir1', 'dir2_CNI')) # The .+ after mycc\\.py below handles /nologo flags from Visual C/C++. expect = test.wrap_stdout("""\ scons: building associated VariantDir targets: %(targets)s -"%(re_python)s" mycc\\.py.* %(INC_CNI)s.* +%(re_python)s mycc\\.py.* %(INC_CNI)s.* Compile -"%(re_python)s" mylink\\.py .+ +%(re_python)s mylink\\.py .+ Link """ % locals()) @@ -120,9 +120,9 @@ INC_CNI = re.escape(os.path.join('INC_dir1', 'dir2_CNI')) test.run(arguments = '', stdout=test.wrap_stdout("""\ scons: building associated VariantDir targets: %(targets)s -"%(re_python)s" mycc\\.py.* %(INC_CNI)s.* +%(re_python)s mycc\\.py.* %(INC_CNI)s.* Compile -"%(re_python)s" mylink\\.py .+ +%(re_python)s mylink\\.py .+ Link """ % locals()), match=TestSCons.match_re, diff --git a/test/scons-time/run/option/verbose.py b/test/scons-time/run/option/verbose.py index 7f693d1..5fc6d64 100644 --- a/test/scons-time/run/option/verbose.py +++ b/test/scons-time/run/option/verbose.py @@ -28,11 +28,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Verify that the run -v and --verbose options display command output. """ +import sys import re import TestSCons_time -_python_ = re.escape(TestSCons_time._python_) +_python_ = re.escape('"' + sys.executable + '"') test = TestSCons_time.TestSCons_time(match = TestSCons_time.match_re, |