Merged in thosrtanner/scons-cache-name (pull request #302)

Change the cache to use 2-character directories rather than one. Also makes a lot more tests run on windows

1 files changed, 8 insertions, 8 deletions

diff --git a/test/Execute.py b/test/Execute.py
index 2e53444..e63cad5 100644
--- a/test/Execute.py
+++ b/test/Execute.py
@@ -45,18 +45,18 @@ sys.exit(exitval)
 """)
 
 test.write('SConstruct', """\
-Execute('%(_python_)s my_copy.py a.in a.out')
-Execute(Action('%(_python_)s my_copy.py b.in b.out'))
+Execute(r'%(_python_)s my_copy.py a.in a.out')
+Execute(Action(r'%(_python_)s my_copy.py b.in b.out'))
 env = Environment(COPY = 'my_copy.py')
-env.Execute('%(_python_)s my_copy.py c.in c.out')
-env.Execute(Action('%(_python_)s my_copy.py d.in d.out'))
-v = env.Execute('%(_python_)s $COPY e.in e.out')
+env.Execute(r'%(_python_)s my_copy.py c.in c.out')
+env.Execute(Action(r'%(_python_)s my_copy.py d.in d.out'))
+v = env.Execute(r'%(_python_)s $COPY e.in e.out')
 assert v == 0, v
-v = env.Execute(Action('%(_python_)s $COPY f.in f.out'))
+v = env.Execute(Action(r'%(_python_)s $COPY f.in f.out'))
 assert v == 0, v
-v = env.Execute('%(_python_)s $COPY g.in g.out 1')
+v = env.Execute(r'%(_python_)s $COPY g.in g.out 1')
 assert v == 1, v
-v = env.Execute(Action('%(_python_)s $COPY h.in h.out 2'))
+v = env.Execute(Action(r'%(_python_)s $COPY h.in h.out 2'))
 assert v == 2, v
 import shutil
 Execute(lambda target, source, env: shutil.copy('i.in', 'i.out'))