diff options
| author | Steven Knight <knight@baldmt.com> | 2003-04-20 04:08:05 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-04-20 04:08:05 (GMT) |
| commit | 78d494e47d685a52b47ba9e071025be152086c74 (patch) | |
| tree | cb31800283fd9402663ad995e53d58e8cc5bca79 | |
| parent | b462d3a29bc8ed264b51c6af5e38cd878ca00ea2 (diff) | |
| download | SCons-78d494e47d685a52b47ba9e071025be152086c74.zip SCons-78d494e47d685a52b47ba9e071025be152086c74.tar.gz SCons-78d494e47d685a52b47ba9e071025be152086c74.tar.bz2 | |
Fixes for Java tests. (Charles Crain)
| -rw-r--r-- | test/JAR.py | 5 | ||||
| -rw-r--r-- | test/JAVAC.py | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/test/JAR.py b/test/JAR.py index 9fdf20e..3636735 100644 --- 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 1651be0..3bc84c7 100644 --- 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'): |