summaryrefslogtreecommitdiffstats
path: root/test/option
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/option
parent14924bcc1713c5bd7dcf4db5b420204407048889 (diff)
parent3e0a831c7fcd60384266e14641a3a15f2cba1ced (diff)
downloadSCons-6a37189174372c9c98c63ada58ab4352adf650e8.zip
SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.gz
SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.bz2
Commit resolved conflicted merge.
Diffstat (limited to 'test/option')
-rw-r--r--test/option/debug-findlibs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/option/debug-findlibs.py b/test/option/debug-findlibs.py
index ce97199..9d5c82a 100644
--- a/test/option/debug-findlibs.py
+++ b/test/option/debug-findlibs.py
@@ -47,7 +47,7 @@ env = Environment(OBJSUFFIX = '.ooo', PROGSUFFIX = '.xxx',
LIBS = ['iii', 'jjj', 'kkk', 'lll', 'mmm'],
LIBPREFIXES = ['a-', 'b-', 'c-'],
LIBSUFFIXES = ['.aaa', '.bbb', '.ccc'],
- LINKCOM = '%(_python_)s cat.py $TARGET $SOURCES')
+ LINKCOM = r'%(_python_)s cat.py $TARGET $SOURCES')
env.Program('foo', 'a.ooo',)
""" % locals())