diff options
| author | Steven Knight <knight@baldmt.com> | 2001-12-30 02:14:54 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2001-12-30 02:14:54 (GMT) |
| commit | 19ece17e5e025b7b9278a846eea60c8d12be438a (patch) | |
| tree | b0718619911b158792b0bcc714f69e388cc8ac14 /test | |
| parent | f98e00b67f9e3d4802d7bce866b3de8559cbc46d (diff) | |
| download | SCons-19ece17e5e025b7b9278a846eea60c8d12be438a.zip SCons-19ece17e5e025b7b9278a846eea60c8d12be438a.tar.gz SCons-19ece17e5e025b7b9278a846eea60c8d12be438a.tar.bz2 | |
Windows test fixes
Diffstat (limited to 'test')
| -rw-r--r-- | test/Depends.py | 4 | ||||
| -rw-r--r-- | test/ENV.py | 2 | ||||
| -rw-r--r-- | test/option--debug.py | 14 |
3 files changed, 11 insertions, 9 deletions
diff --git a/test/Depends.py b/test/Depends.py index 1ccf7f4..10ba86f 100644 --- 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 24fb572..ae9b80c 100644 --- 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 b44c5f6..67291f4 100644 --- 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 |