Merged revisions 3088-3319,3321-3322,3324-3349,3351-3481,3483-3484,3486-3520,3522...

[scons.git] / test / Program-j.py

diff --git a/test/Program-j.py b/test/Program-j.py
index 6b86127a54b8cbee00ea805cd5d711a5c6aa045b..9e0190f6d5c720968f957643ca9e2c3cbb4bf8a8 100644 (file)
--- a/test/Program-j.py
+++ b/test/Program-j.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001 Steven Knight
+# __COPYRIGHT__
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -26,6 +26,13 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
+_exe = TestSCons._exe
+
+f1 = 'f1' + _exe
+f2 = 'f2' + _exe
+f3 = 'f3' + _exe
+f4 = 'f4' + _exe
+
 test = TestSCons.TestSCons()
 
 test.write('SConstruct', """
@@ -36,49 +43,58 @@ env.Program(target = 'f3', source = 'f3.c')
 env.Program(target = 'f4', source = 'f4.c')
 """)
 
-test.write('f1.c', """
+test.write('f1.c', r"""
+#include <stdio.h>
+#include <stdlib.h>
 int
 main(int argc, char *argv[])
 {
     argv[argc++] = "--";
-    printf(\"f1.c\n\");
+    printf("f1.c\n");
     exit (0);
 }
 """)
 
-test.write('f2.c', """
+test.write('f2.c', r"""
+#include <stdio.h>
+#include <stdlib.h>
+
 int
 main(int argc, char *argv[])
 {
     argv[argc++] = "--";
-    printf(\"f2.c\n\");
+    printf("f2.c\n");
     exit (0);
 }
 """)
 
 
-test.write('f3.c', """
+test.write('f3.c', r"""
+#include <stdio.h>
+#include <stdlib.h>
 int
 main(int argc, char *argv[])
 {
     argv[argc++] = "--";
-    printf(\"f3.c\n\");
+    printf("f3.c\n");
     exit (0);
 }
 """)
 
-test.write('f4.c', """
+test.write('f4.c', r"""
+#include <stdio.h>
+#include <stdlib.h>
 int
 main(int argc, char *argv[])
 {
     argv[argc++] = "--";
-    printf(\"f4.c\n\");
+    printf("f4.c\n");
     exit (0);
 }
 """)
 
 
-test.run(arguments = '-j 3 f1 f2 f3 f4')
+test.run(arguments = '-j 3 %s %s %s %s' % (f1, f2, f3, f4))
 
 test.run(program = test.workpath('f1'), stdout = "f1.c\n")
 
@@ -89,3 +105,9 @@ test.run(program = test.workpath('f3'), stdout = "f3.c\n")
 test.run(program = test.workpath('f4'), stdout = "f4.c\n")
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: