Crain: Finish LIBS, LIBPATH, CPPPATH

1 files changed, 4 insertions, 7 deletions

diff --git a/test/Library.py b/test/Library.py
index 3c50f3d..f5e9edb 100644
--- a/test/Library.py
+++ b/test/Library.py
@@ -28,16 +28,13 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-#XXX Need to switch TestBld to Program() when LIBS variable is working.
 test.write('SConstruct', """
-TestBld = Builder(name='TestBld',
-                  action='cc -o $TARGET $SOURCES -L./ -lfoo1 -lfoo2 -lfoo3')
-env = Environment(BUILDERS=[ TestBld, Library ])
+env = Environment(LIBS = [ 'foo1', 'foo2', 'foo3' ],
+                  LIBPATH = [ './' ])
 env.Library(target = 'foo1', source = 'f1.c')
 env.Library(target = 'foo2', source = 'f2a.c f2b.c f2c.c')
 env.Library(target = 'foo3', source = ['f3a.c', 'f3b.c', 'f3c.c'])
-env.TestBld(target = 'prog', source = 'prog.c')
-env.Depends(target = 'prog', dependency = 'libfoo1.a libfoo2.a libfoo3.a')
+env.Program(target = 'prog', source = 'prog.c')
 """)
 
 test.write('f1.c', """
@@ -119,7 +116,7 @@ main(int argc, char *argv[])
 }
 """)
 
-test.run(arguments = 'libfoo1.a libfoo2.a libfoo3.a prog')
+test.run(arguments = 'prog')
 
 test.run(program = test.workpath('prog'),
          stdout = "f1.c\nf2a.c\nf2b.c\nf2c.c\nf3a.c\nf3b.c\nf3c.c\nprog.c\n")