Windows test fixes

git-svn-id: http://scons.tigris.org/svn/scons/trunk@182 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/Depends.py b/test/Depends.py
index 1ccf7f4b76c67ccacb91d89a866e9164c912f5b0..10ba86f4d571445de81261b0236ede987f4cabdd 100644 (file)
--- a/test/Depends.py
+++ b/test/Depends.py
@@ -43,9 +43,9 @@ file.close()
 
 test.write('SConstruct', """
 Foo = Builder(name = "Foo",
-              action = "%s build.py $TARGET $SOURCES subdir/foo.dep")
+              action = r"%s build.py $TARGET $SOURCES subdir/foo.dep")
 Bar = Builder(name = "Bar",
-              action = "%s build.py $TARGET $SOURCES subdir/bar.dep")
+              action = r"%s build.py $TARGET $SOURCES subdir/bar.dep")
 env = Environment(BUILDERS = [Foo, Bar])
 env.Depends(target = ['f1.out', 'f2.out'], dependency = 'subdir/foo.dep')
 env.Depends(target = 'f3.out', dependency = 'subdir/bar.dep')

diff --git a/test/ENV.py b/test/ENV.py
index 24fb572bfaac7cc5e3d6fad0f3d1d2dbc671876d..ae9b80c1a46537776c89307b9a029b01987d57b4 100644 (file)
--- a/test/ENV.py
+++ b/test/ENV.py
@@ -36,7 +36,7 @@ bin2_build_py = test.workpath('bin2', 'build.py')
 
 test.write('SConstruct', """
 import os
-Bld = Builder(name = 'Bld', action = "%s build.py $TARGET $SOURCES")
+Bld = Builder(name = 'Bld', action = r"%s build.py $TARGET $SOURCES")
 env1 = Environment(ENV = {'X' : 'env1'}, BUILDERS = [Bld])
 env2 = Environment(ENV = {'X' : 'env2'}, BUILDERS = [Bld])
 env1.Bld(target = 'env1.out', source = 'input')

diff --git a/test/option--debug.py b/test/option--debug.py
index b44c5f69d84978d866fc71e4ee1a9c56d5eea87b..67291f47ca8aa3a2caeceaae1cbe1d6591fb8397 100644 (file)
--- a/test/option--debug.py
+++ b/test/option--debug.py
@@ -22,7 +22,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "test/option--test.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import sys
@@ -35,7 +35,7 @@ env = Environment()
 env.Program('foo', 'foo.c bar.c')
 """)
 
-test.write('foo.c', """
+test.write('foo.c', r"""
 #include "foo.h"
 int main(int argc, char *argv[])
 {
@@ -71,17 +71,19 @@ else:
 
 test.run(arguments = "--debug=tree " + foo)
 
+import SCons.Defaults
+obj = SCons.Defaults.ConstructionEnvironment['OBJSUFFIX']
 tree = """
-+-foo
-  +-foo.o
++-%s
+  +-foo%s
   | +-foo.c
   |   +-foo.h
   |   +-bar.h
-  +-bar.o
+  +-bar%s
     +-bar.c
       +-bar.h
       +-foo.h
-"""
+""" % (foo, obj,obj)
 
 assert string.find(test.stdout(), tree) != -1