Don't use Program() on some tests that don't need it.

1 files changed, 39 insertions, 54 deletions

diff --git a/test/option-c.py b/test/option-c.py
index 1098a03..0edcebb 100644
--- a/test/option-c.py
+++ b/test/option-c.py
@@ -9,78 +9,63 @@ test = TestSCons.TestSCons()
 
 test.pass_test()	#XXX Short-circuit until this is implemented.
 
-test.write('SConstruct', """
-env = Environment()
-Program(target = 'foo1', source = 'foo1.c')
-Program(target = 'foo2', source = 'foo2.c')
-Program(target = 'foo3', source = 'foo3.c')
+test.write('build.py', r"""
+import sys
+contents = open(sys.argv[2], 'r').read()
+file = open(sys.argv[1], 'w')
+file.write(contents)
+file.close()
 """)
 
-test.write('foo1.c', """
-int
-main(int argc, char *argv[])
-{
-	argv[argc++] = "--";
-	printf("foo1.c\n");
-	exit (0);
-}
+test.write('SConstruct', """
+B = Builder(name = 'B', action = "python ../build.py %(target)s %(source)s")
+env = Environment(BUILDERS = [B])
+env.B(target = 'foo1.out', source = 'foo1.in')
+env.B(target = 'foo2.out', source = 'foo2.in')
+env.B(target = 'foo3.out', source = 'foo3.in')
 """)
 
-test.write('foo2.c', """
-int
-main(int argc, char *argv[])
-{
-	argv[argc++] = "--";
-	printf("foo2.c\n");
-	exit (0);
-}
-""")
+test.write('foo1.in', "foo1.in\n")
 
-test.write('foo3.c', """
-int
-main(int argc, char *argv[])
-{
-	argv[argc++] = "--";
-	printf("foo3.c\n");
-	exit (0);
-}
-""")
+test.write('foo2.in', "foo2.in\n")
+
+test.write('foo3.in', "foo3.in\n")
 
-test.run(arguments = 'foo1 foo2 foo3')
+test.run(arguments = 'foo1.out foo2.out foo3.out')
 
-test.run(program = test.workpath('foo1'), stdout = "foo1.c\n")
-test.run(program = test.workpath('foo2'), stdout = "foo2.c\n")
-test.run(program = test.workpath('foo3'), stdout = "foo3.c\n")
+test.fail_test(test.read(test.workpath('foo1.out')) != "foo1.in\n")
+test.fail_test(test.read(test.workpath('foo2.out')) != "foo2.in\n")
+test.fail_test(test.read(test.workpath('foo3.out')) != "foo3.in\n")
 
-test.run(arguments = '-c foo1')
+test.run(arguments = '-c foo1.out')
 
-test.fail_test(os.path.exists(test.workpath('foo1')))
-test.fail_test(not os.path.exists(test.workpath('foo2')))
-test.fail_test(not os.path.exists(test.workpath('foo3')))
+test.fail_test(os.path.exists(test.workpath('foo1.out')))
+test.fail_test(not os.path.exists(test.workpath('foo2.out')))
+test.fail_test(not os.path.exists(test.workpath('foo3.out')))
 
-test.run(arguments = '--clean foo2')
+test.run(arguments = '--clean foo2.out')
 
-test.fail_test(os.path.exists(test.workpath('foo1')))
-test.fail_test(os.path.exists(test.workpath('foo2')))
-test.fail_test(not os.path.exists(test.workpath('foo3')))
+test.fail_test(os.path.exists(test.workpath('foo1.out')))
+test.fail_test(os.path.exists(test.workpath('foo2.out')))
+test.fail_test(not os.path.exists(test.workpath('foo3.out')))
 
-test.run(arguments = '--remove foo3')
+test.run(arguments = '--remove foo3.out')
 
-test.fail_test(os.path.exists(test.workpath('foo1')))
-test.fail_test(os.path.exists(test.workpath('foo2')))
-test.fail_test(os.path.exists(test.workpath('foo3')))
+test.fail_test(os.path.exists(test.workpath('foo1.out')))
+test.fail_test(os.path.exists(test.workpath('foo2.out')))
+test.fail_test(os.path.exists(test.workpath('foo3.out')))
 
-test.run(arguments = 'foo1 foo2 foo3')
+test.run(arguments = 'foo1.out foo2.out foo3.out')
 
-test.run(program = test.workpath('foo1'), stdout = "foo1.c\n")
-test.run(program = test.workpath('foo2'), stdout = "foo2.c\n")
-test.run(program = test.workpath('foo3'), stdout = "foo3.c\n")
+test.run(program = test.workpath('foo1.out'), stdout = "foo1.in\n")
+test.run(program = test.workpath('foo2.out'), stdout = "foo2.in\n")
+test.run(program = test.workpath('foo3.out'), stdout = "foo3.in\n")
 
 test.run(arguments = '-c .')
 
-test.fail_test(os.path.exists(test.workpath('foo1')))
-test.fail_test(os.path.exists(test.workpath('foo2')))
-test.fail_test(os.path.exists(test.workpath('foo3')))
+test.fail_test(os.path.exists(test.workpath('foo1.out')))
+test.fail_test(os.path.exists(test.workpath('foo2.out')))
+test.fail_test(os.path.exists(test.workpath('foo3.out')))
 
 test.pass_test()