Fixes for Java tests. (Charles Crain)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@653 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/JAR.py b/test/JAR.py
index 9fdf20e397441fbb5d45cedfd0e622ea44537b0f..3636735373828efaf5405ebae4d4733262730205 100644 (file)
--- a/test/JAR.py
+++ b/test/JAR.py
@@ -33,7 +33,6 @@ python = TestSCons.python
 
 test = TestSCons.TestSCons()
 
-
 test.write('myjar.py', r"""
 import sys
 args = sys.argv[1:]
@@ -75,7 +74,7 @@ if os.path.normcase('.class') == os.path.normcase('.CLASS'):
     test.write('SConstruct', """
 env = Environment(tools = ['jar'],
                   JAR = r'%s myjar.py')
-env.Program(target = 'test2.jar', source = 'test2.CLASS')
+env.Jar(target = 'test2.jar', source = 'test2.CLASS')
 """ % (python))
 
     test.write('test2.CLASS', """\
@@ -86,7 +85,7 @@ line 3
 
     test.run(arguments = '.', stderr = None)
 
-    test.fail_test(test.read('test2' + _exe) != "test2.CLASS\nline 3\n")
+    test.fail_test(test.read('test2.jar') != "test2.CLASS\nline 3\n")
 
 
 if not os.path.exists('/usr/local/j2sdk1.3.1/bin/javac'):

diff --git a/test/JAVAC.py b/test/JAVAC.py
index 1651be073cea7d34b63f84d887b6ad18474b5ded..3bc84c7cdf85fe8de52e8a2eed8ffa583e2759b3 100644 (file)
--- a/test/JAVAC.py
+++ b/test/JAVAC.py
@@ -78,7 +78,7 @@ if os.path.normcase('.java') == os.path.normcase('.JAVA'):
 env = Environment(tools = ['javac'],
                   JAVAC = r'%s myjavac.py')
 env.Java(target = '.', source = '.')
-""" % (python, python))
+""" % python)
 
     test.write('test2.JAVA', """\
 test2.JAVA
@@ -88,7 +88,7 @@ line 3
 
     test.run(arguments = '.', stderr = None)
 
-    test.fail_test(test.read('test2.class') != "test2.JAVA\nline3\n")
+    test.fail_test(test.read('test2.class') != "test2.JAVA\nline 3\n")
 
 
 if not os.path.exists('/usr/local/j2sdk1.3.1/bin/javac'):