diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2016-01-30 22:39:17 +0000 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2016-01-30 22:39:17 +0000 |
| commit | 92fd45b8c36d14e9a4edb2a4b5a78882167e7525 (patch) | |
| tree | 912fb4db4a3e452f811ab3a922a05d76bf4dba10 /test/Configure | |
| parent | cefa78744e92f319112c1a5fc26f34727e9bbc5c (diff) | |
| download | scons-92fd45b8c36d14e9a4edb2a4b5a78882167e7525.tar.gz | |
Fix for backslash being treated as an escape character
On my windows system, my python is in c:\apps\32\python. Theres a lot of places
where that \32 gets turned into an ascii character and the unit tests don't run.
Diffstat (limited to 'test/Configure')
| -rw-r--r-- | test/Configure/Builder-call.py | 2 | ||||
| -rw-r--r-- | test/Configure/custom-tests.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/Configure/Builder-call.py b/test/Configure/Builder-call.py index 037a2c77..b85b0398 100644 --- a/test/Configure/Builder-call.py +++ b/test/Configure/Builder-call.py @@ -48,7 +48,7 @@ def CustomTest(*args): return 0 conf = env.Configure(custom_tests = {'MyTest' : CustomTest}) if not conf.MyTest(): - env.Command("hello", [], '%(_python_)s mycommand.py $TARGET') + env.Command("hello", [], r'%(_python_)s mycommand.py $TARGET') env = conf.Finish() """ % locals()) diff --git a/test/Configure/custom-tests.py b/test/Configure/custom-tests.py index 687ba489..503eb4e4 100644 --- a/test/Configure/custom-tests.py +++ b/test/Configure/custom-tests.py @@ -63,8 +63,8 @@ def CheckCustom(test): retLinkFAIL = test.TryLink( '%(linkFAIL)s', '.c' ) (retRunOK, outputRunOK) = test.TryRun( '%(runOK)s', '.c' ) (retRunFAIL, outputRunFAIL) = test.TryRun( '%(runFAIL)s', '.c' ) - (retActOK, outputActOK) = test.TryAction( '%(_python_)s pyAct.py 0 > $TARGET' ) - (retActFAIL, outputActFAIL) = test.TryAction( '%(_python_)s pyAct.py 1 > $TARGET' ) + (retActOK, outputActOK) = test.TryAction( r'%(_python_)s pyAct.py 0 > $TARGET' ) + (retActFAIL, outputActFAIL) = test.TryAction( r'%(_python_)s pyAct.py 1 > $TARGET' ) resOK = retCompileOK and retLinkOK and retRunOK and outputRunOK=="Hello" resOK = resOK and retActOK and int(outputActOK)==0 resFAIL = retCompileFAIL or retLinkFAIL or retRunFAIL or outputRunFAIL!="" |