Make the (s) and variables upper-case.

16 files changed, 31 insertions, 31 deletions

diff --git a/test/Command.py b/test/Command.py
index e9d7452..2b704fc 100644
--- a/test/Command.py
+++ b/test/Command.py
@@ -42,12 +42,12 @@ file.close()
 test.write('SConstruct', """
 env = Environment()
 env.Command(target = 'f1.out', source = 'f1.in',
-            action = r'%s build.py $target $sources')
+            action = r'%s build.py $TARGET $SOURCES')
 env.Command(target = 'f2.out', source = 'f2.in',
-            action = r'%s' + " build.py temp2 $sources\\n" + r'%s' + " build.py $target temp2")
+            action = r'%s' + " build.py temp2 $SOURCES\\n" + r'%s' + " build.py $TARGET temp2")
 env.Command(target = 'f3.out', source = 'f3.in',
-            action = [r'%s build.py temp3 $sources',
-                      r'%s build.py $target temp3'])
+            action = [r'%s build.py temp3 $SOURCES',
+                      r'%s build.py $TARGET temp3'])
 # Eventually, add ability to do execute Python code.
 """ % (python, python, python, python, python))
 
diff --git a/test/Default.py b/test/Default.py
index 9155660..93e6be6 100644
--- a/test/Default.py
+++ b/test/Default.py
@@ -43,7 +43,7 @@ file.close()
 """)
 
 test.write(['one', 'SConstruct'], """
-B = Builder(name = 'B', action = r'%s ../build.py $target $sources')
+B = Builder(name = 'B', action = r'%s ../build.py $TARGET $SOURCES')
 env = Environment(BUILDERS = [B])
 env.B(target = 'foo.out', source = 'foo.in')
 env.B(target = 'bar.out', source = 'bar.in')
@@ -51,7 +51,7 @@ Default('foo.out')
 """ % python)
 
 test.write(['two', 'SConstruct'], """
-B = Builder(name = 'B', action = r'%s ../build.py $target $sources')
+B = Builder(name = 'B', action = r'%s ../build.py $TARGET $SOURCES')
 env = Environment(BUILDERS = [B])
 env.B(target = 'foo.out', source = 'foo.in')
 env.B(target = 'bar.out', source = 'bar.in')
@@ -59,7 +59,7 @@ Default('foo.out', 'bar.out')
 """ % python)
 
 test.write(['three', 'SConstruct'], """
-B = Builder(name = 'B', action = r'%s ../build.py $target $sources')
+B = Builder(name = 'B', action = r'%s ../build.py $TARGET $SOURCES')
 env = Environment(BUILDERS = [B])
 env.B(target = 'foo.out', source = 'foo.in')
 env.B(target = 'bar.out', source = 'bar.in')
diff --git a/test/Depends.py b/test/Depends.py
index 5fb0479..822573a 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 = "%s build.py $TARGET $SOURCES subdir/foo.dep")
 Bar = Builder(name = "Bar",
-              action = "%s build.py $target $sources subdir/bar.dep")
+              action = "%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 1ff699d..50032df 100644
--- a/test/ENV.py
+++ b/test/ENV.py
@@ -40,7 +40,7 @@ test.write('SConstruct', """
 import os
 bin1_path = r'%s' + os.pathsep + os.environ['PATH']
 bin2_path = r'%s' + os.pathsep + os.environ['PATH']
-Bld = Builder(name = 'Bld', action = "build.py $target $sources")
+Bld = Builder(name = 'Bld', action = "build.py $TARGET $SOURCES")
 bin1 = Environment(ENV = {'PATH' : bin1_path}, BUILDERS = [Bld])
 bin2 = Environment(ENV = {'PATH' : bin2_path}, BUILDERS = [Bld])
 bin1.Bld(target = 'bin1.out', source = 'input')
diff --git a/test/Library.py b/test/Library.py
index 7e832ca..3c50f3d 100644
--- a/test/Library.py
+++ b/test/Library.py
@@ -31,7 +31,7 @@ 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')
+                  action='cc -o $TARGET $SOURCES -L./ -lfoo1 -lfoo2 -lfoo3')
 env = Environment(BUILDERS=[ TestBld, Library ])
 env.Library(target = 'foo1', source = 'f1.c')
 env.Library(target = 'foo2', source = 'f2a.c f2b.c f2c.c')
diff --git a/test/builderrors.py b/test/builderrors.py
index 769215a..c76568e 100644
--- a/test/builderrors.py
+++ b/test/builderrors.py
@@ -46,8 +46,8 @@ sys.exit(exitval)
 """)
 
 test.write(['one', 'SConstruct'], """
-B0 = Builder(name = 'B0', action = r'%s ../build.py 0 $target $sources')
-B1 = Builder(name = 'B1', action = r'%s ../build.py 1 $target $sources')
+B0 = Builder(name = 'B0', action = r'%s ../build.py 0 $TARGET $SOURCES')
+B1 = Builder(name = 'B1', action = r'%s ../build.py 1 $TARGET $SOURCES')
 env = Environment(BUILDERS = [B0, B1])
 env.B1(target = 'f1.out', source = 'f1.in')
 env.B0(target = 'f2.out', source = 'f2.in')
@@ -66,8 +66,8 @@ test.fail_test(os.path.exists(test.workpath('f2.out')))
 test.fail_test(os.path.exists(test.workpath('f3.out')))
 
 test.write(['two', 'SConstruct'], """
-B0 = Builder(name = 'B0', action = r'%s ../build.py 0 $target $sources')
-B1 = Builder(name = 'B1', action = r'%s ../build.py 1 $target $sources')
+B0 = Builder(name = 'B0', action = r'%s ../build.py 0 $TARGET $SOURCES')
+B1 = Builder(name = 'B1', action = r'%s ../build.py 1 $TARGET $SOURCES')
 env = Environment(BUILDERS = [B0, B1])
 env.B0(target = 'f1.out', source = 'f1.in')
 env.B1(target = 'f2.out', source = 'f2.in')
@@ -86,8 +86,8 @@ test.fail_test(os.path.exists(test.workpath('f2.out')))
 test.fail_test(os.path.exists(test.workpath('f3.out')))
 
 test.write(['three', 'SConstruct'], """
-B0 = Builder(name = 'B0', action = r'%s ../build.py 0 $target $sources')
-B1 = Builder(name = 'B1', action = r'%s ../build.py 1 $target $sources')
+B0 = Builder(name = 'B0', action = r'%s ../build.py 0 $TARGET $SOURCES')
+B1 = Builder(name = 'B1', action = r'%s ../build.py 1 $TARGET $SOURCES')
 env = Environment(BUILDERS = [B0, B1])
 env.B0(target = 'f1.out', source = 'f1.in')
 env.B0(target = 'f2.out', source = 'f2.in')
diff --git a/test/multiline.py b/test/multiline.py
index 7560d55..9b7ee61 100644
--- a/test/multiline.py
+++ b/test/multiline.py
@@ -42,9 +42,9 @@ sys.exit(0)
 """)
 
 test.write('SConstruct', """
-B1 = Builder(name = 'B1', action = [r'%s build.py .temp $sources',
-                                    r'%s build.py $targets .temp'])
-B2 = Builder(name = 'B2', action = r'%s' + " build.py .temp $sources\\n" + r'%s' + " build.py $targets .temp")
+B1 = Builder(name = 'B1', action = [r'%s build.py .temp $SOURCES',
+                                    r'%s build.py $TARGETS .temp'])
+B2 = Builder(name = 'B2', action = r'%s' + " build.py .temp $SOURCES\\n" + r'%s' + " build.py $TARGETS .temp")
 env = Environment(BUILDERS = [B1, B2])
 env.B1(target = 'foo1.out', source = 'foo1.in')
 env.B2(target = 'foo2.out', source = 'foo2.in')
diff --git a/test/option--.py b/test/option--.py
index 5370488..ada5f58 100644
--- a/test/option--.py
+++ b/test/option--.py
@@ -42,7 +42,7 @@ file.close()
 
 test.write('SConstruct', """
 MyBuild = Builder(name = "MyBuild",
-                  action = r'%s build.py $targets')
+                  action = r'%s build.py $TARGETS')
 env = Environment(BUILDERS = [MyBuild])
 env.MyBuild(target = '-f1.out', source = 'f1.in')
 env.MyBuild(target = '-f2.out', source = 'f2.in')
diff --git a/test/option-c.py b/test/option-c.py
index b188d53..105db49 100644
--- a/test/option-c.py
+++ b/test/option-c.py
@@ -41,7 +41,7 @@ file.close()
 """)
 
 test.write('SConstruct', """
-B = Builder(name = 'B', action = r'%s build.py $targets $sources')
+B = Builder(name = 'B', action = r'%s build.py $TARGETS $SOURCES')
 env = Environment(BUILDERS = [B])
 env.B(target = 'foo1.out', source = 'foo1.in')
 env.B(target = 'foo2.out', source = 'foo2.in')
diff --git a/test/option-i.py b/test/option-i.py
index 8991550..d572be6 100644
--- a/test/option-i.py
+++ b/test/option-i.py
@@ -46,8 +46,8 @@ sys.exit(1)
 """)
 
 test.write('SConstruct', """
-Succeed = Builder(name = "Succeed", action = r'%s succeed.py $targets')
-Fail = Builder(name = "Fail", action = r'%s fail.py $targets')
+Succeed = Builder(name = "Succeed", action = r'%s succeed.py $TARGETS')
+Fail = Builder(name = "Fail", action = r'%s fail.py $TARGETS')
 env = Environment(BUILDERS = [Succeed, Fail])
 env.Fail(target = 'aaa.1', source = 'aaa.in')
 env.Succeed(target = 'aaa.out', source = 'aaa.1')
diff --git a/test/option-j.py b/test/option-j.py
index 3eb0b12..168f2b5 100644
--- a/test/option-j.py
+++ b/test/option-j.py
@@ -53,7 +53,7 @@ file.close()
 
 test.write('SConstruct', """
 MyBuild = Builder(name = "MyBuild",
-                  action = r'%s build.py $targets')
+                  action = r'%s build.py $TARGETS')
 env = Environment(BUILDERS = [MyBuild])
 env.MyBuild(target = 'f1', source = 'f1.in')
 env.MyBuild(target = 'f2', source = 'f2.in')
diff --git a/test/option-k.py b/test/option-k.py
index 6b9e89a..83e4020 100644
--- a/test/option-k.py
+++ b/test/option-k.py
@@ -46,8 +46,8 @@ sys.exit(1)
 """)
 
 test.write('SConstruct', """
-Succeed = Builder(name = "Succeed", action = r'%s succeed.py $targets')
-Fail = Builder(name = "Fail", action = r'%s fail.py $targets')
+Succeed = Builder(name = "Succeed", action = r'%s succeed.py $TARGETS')
+Fail = Builder(name = "Fail", action = r'%s fail.py $TARGETS')
 env = Environment(BUILDERS = [Succeed, Fail])
 env.Fail(target = 'aaa.1', source = 'aaa.in')
 env.Succeed(target = 'aaa.out', source = 'aaa.1')
diff --git a/test/option-n.py b/test/option-n.py
index 0a5a225..23c6bd7 100644
--- a/test/option-n.py
+++ b/test/option-n.py
@@ -42,7 +42,7 @@ file.close()
 
 test.write('SConstruct', """
 MyBuild = Builder(name = "MyBuild",
-                  action = r'%s build.py $targets')
+                  action = r'%s build.py $TARGETS')
 env = Environment(BUILDERS = [MyBuild])
 env.MyBuild(target = 'f1.out', source = 'f1.in')
 env.MyBuild(target = 'f2.out', source = 'f2.in')
diff --git a/test/option-s.py b/test/option-s.py
index 666060e..b34a02e 100644
--- a/test/option-s.py
+++ b/test/option-s.py
@@ -42,7 +42,7 @@ file.close()
 
 test.write('SConstruct', """
 MyBuild = Builder(name = "MyBuild",
-                  action = r'%s build.py $target')
+                  action = r'%s build.py $TARGET')
 env = Environment(BUILDERS = [MyBuild])
 env.MyBuild(target = 'f1.out', source = 'f1.in')
 env.MyBuild(target = 'f2.out', source = 'f2.in')
diff --git a/test/subdir.py b/test/subdir.py
index 7071b54..2161195 100644
--- a/test/subdir.py
+++ b/test/subdir.py
@@ -40,7 +40,7 @@ file.close()
 """)
 
 test.write('SConstruct', """
-B = Builder(name = "B", action = "python build.py $targets $sources")
+B = Builder(name = "B", action = "python build.py $TARGETS $SOURCES")
 env = Environment(BUILDERS = [B])
 env.B(target = 'subdir/f1.out', source = 'subdir/f1.in')
 env.B(target = 'subdir/f2.out', source = 'subdir/f2.in')
diff --git a/test/up-to-date.py b/test/up-to-date.py
index dd7d86a..7620409 100644
--- a/test/up-to-date.py
+++ b/test/up-to-date.py
@@ -42,7 +42,7 @@ file.close()
 """)
 
 test.write('SConstruct', """
-B = Builder(name = "B", action = r'%s build.py $targets $sources')
+B = Builder(name = "B", action = r'%s build.py $TARGETS $SOURCES')
 env = Environment(BUILDERS = [B])
 env.B(target = 'f1.out', source = 'f1.in')
 env.B(target = 'f2.out', source = 'f2.in')