diff options
| author | Mats Wichmann <mats@linux.com> | 2021-04-16 15:02:49 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2021-04-16 15:02:49 (GMT) |
| commit | 5a2c80ec0e3a89568dea91196064d8d4afe7afa3 (patch) | |
| tree | 5bb415e68edefd2e22bd9bbd0e8f5864b2656bfe | |
| parent | 113de336dc49772552cbd7dbf634b8708ecede88 (diff) | |
| download | SCons-5a2c80ec0e3a89568dea91196064d8d4afe7afa3.zip SCons-5a2c80ec0e3a89568dea91196064d8d4afe7afa3.tar.gz SCons-5a2c80ec0e3a89568dea91196064d8d4afe7afa3.tar.bz2 | |
[PR 3930] more rawstring stuff in tests (Windows)
Signed-off-by: Mats Wichmann <mats@linux.com>
| -rw-r--r-- | test/long-lines/signature.py | 2 | ||||
| -rw-r--r-- | test/sconsign/script/SConsignFile.py | 4 | ||||
| -rw-r--r-- | test/sconsign/script/Signatures.py | 4 | ||||
| -rw-r--r-- | test/sconsign/script/no-SConsignFile.py | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/test/long-lines/signature.py b/test/long-lines/signature.py index f399279..ef1b956 100644 --- a/test/long-lines/signature.py +++ b/test/long-lines/signature.py @@ -83,7 +83,7 @@ env = Environment( TEMPFILEPREFIX='@', ) env.PrependENVPath('PATHEXT', '.PY') -env.Command('file.out', 'file.in', '%(_python_)s ${TEMPFILE(FILECOM)}') +env.Command('file.out', 'file.in', r'%(_python_)s ${TEMPFILE(FILECOM)}') """ % locals()) test.write('file.in', "file.in\n", mode='w') diff --git a/test/sconsign/script/SConsignFile.py b/test/sconsign/script/SConsignFile.py index f7914fe..c54e17b 100644 --- a/test/sconsign/script/SConsignFile.py +++ b/test/sconsign/script/SConsignFile.py @@ -111,8 +111,8 @@ env2.Program('sub2/hello.c') """ % locals()) # TODO in the above, we would normally want to run a python program # using "our python" as in: -# CCCOM=[['%(_python_)s', '%(fake_cc_py)s', 'sub2', '$TARGET', '$SOURCE']], -# LINKCOM=[['%(_python_)s', '%(fake_link_py)s', '$TARGET', '$SOURCE']], +# CCCOM=[[r'%(_python_)s', r'%(fake_cc_py)s', 'sub2', '$TARGET', '$SOURCE']], +# LINKCOM=[[r'%(_python_)s', r'%(fake_link_py)s', '$TARGET', '$SOURCE']], # however we're looking at dependencies with sconsign, so that breaks things test.write(['sub1', 'hello.c'], r""" diff --git a/test/sconsign/script/Signatures.py b/test/sconsign/script/Signatures.py index 4f1d2b9..0f21496 100644 --- a/test/sconsign/script/Signatures.py +++ b/test/sconsign/script/Signatures.py @@ -123,8 +123,8 @@ env2.Program('sub2/hello.c') """ % locals()) # TODO in the above, we would normally want to run a python program # using "our python" as in: -# CCCOM=[['%(_python_)s', '%(fake_cc_py)s', 'sub2', '$TARGET', '$SOURCE']], -# LINKCOM=[['%(_python_)s', '%(fake_link_py)s', '$TARGET', '$SOURCE']], +# CCCOM=[[r'%(_python_)s', r'%(fake_cc_py)s', 'sub2', '$TARGET', '$SOURCE']], +# LINKCOM=[[r'%(_python_)s', r'%(fake_link_py)s', '$TARGET', '$SOURCE']], # however we're looking at dependencies with sconsign, so that breaks things test.write(['sub1', 'hello.c'], r"""\ diff --git a/test/sconsign/script/no-SConsignFile.py b/test/sconsign/script/no-SConsignFile.py index a33a446..c345829 100644 --- a/test/sconsign/script/no-SConsignFile.py +++ b/test/sconsign/script/no-SConsignFile.py @@ -128,8 +128,8 @@ env2.Program('sub2/hello.c') """ % locals()) # TODO in the above, we would normally want to run a python program # using "our python" as in: -# CCCOM=[['%(_python_)s', '%(fake_cc_py)s', 'sub2', '$TARGET', '$SOURCE']], -# LINKCOM=[['%(_python_)s', '%(fake_link_py)s', '$TARGET', '$SOURCE']], +# CCCOM=[[r'%(_python_)s', r'%(fake_cc_py)s', 'sub2', '$TARGET', '$SOURCE']], +# LINKCOM=[[r'%(_python_)s', r'%(fake_link_py)s', '$TARGET', '$SOURCE']], # however we're looking at dependencies with sconsign, so that breaks things test.write(['sub1', 'hello.c'], r"""\ |