summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-06-11 22:19:47 (GMT)
committerSteven Knight <knight@baldmt.com>2002-06-11 22:19:47 (GMT)
commitd1b81f58263a824ca39ecc179f61ad541c5a0f7a (patch)
treeb4e55595b7253b73970bcb4b2b1e1cc1eeaeee8f /test
parent9298969ebb3bfbb7c2c27b6f3352b26113361faf (diff)
downloadSCons-d1b81f58263a824ca39ecc179f61ad541c5a0f7a.zip
SCons-d1b81f58263a824ca39ecc179f61ad541c5a0f7a.tar.gz
SCons-d1b81f58263a824ca39ecc179f61ad541c5a0f7a.tar.bz2
Remove white-space split of file name lists.
Diffstat (limited to 'test')
-rw-r--r--test/CPPFLAGS.py2
-rw-r--r--test/CPPPATH.py2
-rw-r--r--test/Default.py2
-rw-r--r--test/LIBPATH.py2
-rw-r--r--test/LIBS.py2
-rw-r--r--test/Library.py2
-rw-r--r--test/Object.py2
-rw-r--r--test/Program.py2
-rw-r--r--test/SharedLibrary.py2
-rw-r--r--test/option--debug.py2
-rw-r--r--test/option--implicit-cache.py2
11 files changed, 11 insertions, 11 deletions
diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py
index 977d9ff..9c0295c 100644
--- a/test/CPPFLAGS.py
+++ b/test/CPPFLAGS.py
@@ -110,7 +110,7 @@ env = Environment(CPPFLAGS = '-x',
CC = r'%s mygcc.py cc',
CXX = r'%s mygcc.py c++',
F77 = r'%s mygcc.py g77')
-env.Program(target = 'foo', source = 'test1.c test2.cpp test3.F')
+env.Program(target = 'foo', source = Split('test1.c test2.cpp test3.F'))
""" % (python, python, python, python))
test.write('test1.c', r"""test1.c
diff --git a/test/CPPPATH.py b/test/CPPPATH.py
index d09ecb8..a2cae10 100644
--- a/test/CPPPATH.py
+++ b/test/CPPPATH.py
@@ -163,7 +163,7 @@ test.up_to_date(arguments = args)
# Change CPPPATH and make sure we don't rebuild because of it.
test.write('SConstruct', """
-env = Environment(CPPPATH = 'inc2 include')
+env = Environment(CPPPATH = Split('inc2 include'))
obj = env.Object(target='foobar/prog', source='subdir/prog.c')
env.Program(target='prog', source=obj)
SConscript('subdir/SConscript', "env")
diff --git a/test/Default.py b/test/Default.py
index 96d786a..5f8aff8 100644
--- a/test/Default.py
+++ b/test/Default.py
@@ -63,7 +63,7 @@ B = Builder(action = r'%s ../build.py $TARGET $SOURCES')
env = Environment(BUILDERS = { 'B' : B })
env.B(target = 'foo.out', source = 'foo.in')
env.B(target = 'bar.out', source = 'bar.in')
-Default('foo.out bar.out')
+Default(Split('foo.out bar.out'))
""" % python)
test.write(['four', 'SConstruct'], """
diff --git a/test/LIBPATH.py b/test/LIBPATH.py
index 871437c..d0bb065 100644
--- a/test/LIBPATH.py
+++ b/test/LIBPATH.py
@@ -118,7 +118,7 @@ env1.Program(target = 'prog', source = prog)
env1.Library(target = './lib1/foo1', source = f1)
env2 = Environment(LIBS = 'foo2',
- LIBPATH = '. ./lib2')
+ LIBPATH = Split('. ./lib2'))
env2.Program(target = 'prog2', source = prog)
env2.Library(target = 'foo2', source = f1)
""")
diff --git a/test/LIBS.py b/test/LIBS.py
index 6fb678a..0933d6f 100644
--- a/test/LIBS.py
+++ b/test/LIBS.py
@@ -47,7 +47,7 @@ SConscript('sub2/SConscript', 'env')
test.write(['sub1', 'SConscript'], r"""
Import('env')
-lib = env.Library(target='bar', source='bar.c baz.c')
+lib = env.Library(target='bar', source=Split('bar.c baz.c'))
env.Install('..', lib)
""")
diff --git a/test/Library.py b/test/Library.py
index f13dad3..adbb334 100644
--- a/test/Library.py
+++ b/test/Library.py
@@ -32,7 +32,7 @@ test.write('SConstruct', """
env = Environment(LIBS = [ 'foo1', 'foo2' ],
LIBPATH = [ '.' ])
env.Library(target = 'foo1', source = 'f1.c')
-env.Library(target = 'foo2', source = 'f2a.c f2b.c f2c.c')
+env.Library(target = 'foo2', source = Split('f2a.c f2b.c f2c.c'))
libtgt=env.Library(target = 'foo3', source = ['f3a.c', 'f3b.c', 'f3c.c'])
env.Program(target = 'prog', source = [ 'prog.c', libtgt ])
""")
diff --git a/test/Object.py b/test/Object.py
index c936be6..b5ebcf7 100644
--- a/test/Object.py
+++ b/test/Object.py
@@ -39,7 +39,7 @@ env = Environment()
f1 = env.Object(target = 'f1', source = 'f1.c')
f2 = env.Object(target = 'f2', source = 'f2.cpp')
f3 = env.Object(target = 'f3', source = 'f3.c')
-env.Program(target = 'prog1', source = 'f1%s f2%s f3%s prog.cpp')
+env.Program(target = 'prog1', source = Split('f1%s f2%s f3%s prog.cpp'))
env.Program(target = 'prog2', source = [f1, f2, f3, 'prog.cpp'])
env.Program(target = 'prog3', source = ['f1%s', f2, 'f3%s', 'prog.cpp'])
""" % (_obj, _obj, _obj, _obj, _obj))
diff --git a/test/Program.py b/test/Program.py
index 197f21c..5e1f259 100644
--- a/test/Program.py
+++ b/test/Program.py
@@ -44,7 +44,7 @@ foo_args = 'foo1%s foo2%s foo3%s' % (_exe, _exe, _exe)
test.write('SConstruct', """
env = Environment()
env.Program(target = 'foo1', source = 'f1.c')
-env.Program(target = 'foo2', source = 'f2a.c f2b.c f2c.c')
+env.Program(target = 'foo2', source = Split('f2a.c f2b.c f2c.c'))
env.Program(target = 'foo3', source = ['f3a.c', 'f3b.c', 'f3c.c'])
""")
diff --git a/test/SharedLibrary.py b/test/SharedLibrary.py
index 6e96fd3..dfe05af 100644
--- a/test/SharedLibrary.py
+++ b/test/SharedLibrary.py
@@ -35,7 +35,7 @@ env=Environment(WIN32_INSERT_DEF=1)
env2 = Environment(LIBS = [ 'foo1', 'foo2', 'foo3' ],
LIBPATH = [ '.' ])
env.Library(target = 'foo1', source = 'f1.c', shared=1)
-env.Library(target = 'foo2', source = 'f2a.c f2b.c f2c.c', shared=1)
+env.Library(target = 'foo2', source = Split('f2a.c f2b.c f2c.c'), shared=1)
env.Library(target = 'foo3', source = ['f3a.c', 'f3b.c', 'f3c.c'], shared=1)
env2.Program(target = 'prog', source = 'prog.c')
""")
diff --git a/test/option--debug.py b/test/option--debug.py
index 95a3a9c..6561a05 100644
--- a/test/option--debug.py
+++ b/test/option--debug.py
@@ -34,7 +34,7 @@ test = TestSCons.TestSCons()
test.write('SConstruct', """
env = Environment(OBJSUFFIX = '.ooo', PROGSUFFIX = '.xxx')
-env.Program('foo', 'foo.c bar.c')
+env.Program('foo', Split('foo.c bar.c'))
""")
test.write('foo.c', r"""
diff --git a/test/option--implicit-cache.py b/test/option--implicit-cache.py
index 6ebff3a..3460b2f 100644
--- a/test/option--implicit-cache.py
+++ b/test/option--implicit-cache.py
@@ -46,7 +46,7 @@ test = TestSCons.TestSCons()
test.subdir('include', 'subdir', ['subdir', 'include'], 'inc2')
test.write('SConstruct', """
-env = Environment(CPPPATH = 'inc2 include')
+env = Environment(CPPPATH = Split('inc2 include'))
obj = env.Object(target='prog', source='subdir/prog.c')
env.Program(target='prog', source=obj)
SConscript('subdir/SConscript', "env")