summaryrefslogtreecommitdiffstats
path: root/test/MSVC
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2016-04-10 09:41:00 (GMT)
committerRussel Winder <russel@winder.org.uk>2016-04-10 09:41:00 (GMT)
commit6a37189174372c9c98c63ada58ab4352adf650e8 (patch)
tree521ddb1071569fa90100e11d7f03af13d5689aaf /test/MSVC
parent14924bcc1713c5bd7dcf4db5b420204407048889 (diff)
parent3e0a831c7fcd60384266e14641a3a15f2cba1ced (diff)
downloadSCons-6a37189174372c9c98c63ada58ab4352adf650e8.zip
SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.gz
SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.bz2
Commit resolved conflicted merge.
Diffstat (limited to 'test/MSVC')
-rw-r--r--test/MSVC/batch.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/MSVC/batch.py b/test/MSVC/batch.py
index fbb3218..8648292 100644
--- a/test/MSVC/batch.py
+++ b/test/MSVC/batch.py
@@ -72,8 +72,8 @@ for infile in sys.argv[2:]:
""")
test.write('SConstruct', """
-cccom = '%(_python_)s fake_cl.py $_MSVC_OUTPUT_FLAG $CHANGED_SOURCES'
-linkcom = '%(_python_)s fake_link.py ${TARGET.windows} $SOURCES'
+cccom = r'%(_python_)s fake_cl.py $_MSVC_OUTPUT_FLAG $CHANGED_SOURCES'
+linkcom = r'%(_python_)s fake_link.py ${TARGET.windows} $SOURCES'
env = Environment(tools=['msvc', 'mslink'],
CCCOM=cccom,
LINKCOM=linkcom,