summaryrefslogtreecommitdiffstats
path: root/test/subdir.py
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/subdir.py
parent14924bcc1713c5bd7dcf4db5b420204407048889 (diff)
parent3e0a831c7fcd60384266e14641a3a15f2cba1ced (diff)
downloadSCons-6a37189174372c9c98c63ada58ab4352adf650e8.zip
SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.gz
SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.bz2
Commit resolved conflicted merge.
Diffstat (limited to 'test/subdir.py')
-rw-r--r--test/subdir.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/subdir.py b/test/subdir.py
index fa10cff..22d0912 100644
--- a/test/subdir.py
+++ b/test/subdir.py
@@ -42,7 +42,7 @@ file.close()
""")
test.write('SConstruct', """
-B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES')
+B = Builder(action = r'%(_python_)s build.py $TARGETS $SOURCES')
env = Environment(BUILDERS = { 'B' : B })
env.B(target = 'subdir/f1.out', source = 'subdir/f1.in')
env.B(target = 'subdir/f2.out', source = 'subdir/f2.in')