summaryrefslogtreecommitdiffstats
path: root/test/JAVAC.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-04-08 05:00:51 (GMT)
committerSteven Knight <knight@baldmt.com>2003-04-08 05:00:51 (GMT)
commit393e4ca7e9d1308803da49bee667f1a874c612db (patch)
treef0ac1818542b5cc730b5c6792f64fc5ee6f3b814 /test/JAVAC.py
parentb967a4a50e7ad193583412bc5a585acde1fddbe7 (diff)
downloadSCons-393e4ca7e9d1308803da49bee667f1a874c612db.zip
SCons-393e4ca7e9d1308803da49bee667f1a874c612db.tar.gz
SCons-393e4ca7e9d1308803da49bee667f1a874c612db.tar.bz2
Enhance Java support for package names that don't match the source directory hierarchy.
Diffstat (limited to 'test/JAVAC.py')
-rw-r--r--test/JAVAC.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/JAVAC.py b/test/JAVAC.py
index 61d8d4b..9526259 100644
--- a/test/JAVAC.py
+++ b/test/JAVAC.py
@@ -129,7 +129,7 @@ public class Example1
""")
test.write(['com', 'sub', 'foo', 'Example2.java'], """\
-package com.sub.foo;
+package com.other;
public class Example2
{
@@ -171,7 +171,7 @@ public class Example4
""")
test.write(['com', 'sub', 'bar', 'Example5.java'], """\
-package com.sub.bar;
+package com.other;
public class Example5
{
@@ -203,10 +203,10 @@ test.run(arguments = '.')
test.fail_test(test.read('wrapper.out') != "wrapper.py /usr/local/j2sdk1.3.1/bin/javac -d classes -sourcepath com/sub/bar com/sub/bar/Example4.java com/sub/bar/Example5.java com/sub/bar/Example6.java\n")
test.fail_test(not os.path.exists(test.workpath('classes', 'com', 'sub', 'foo', 'Example1.class')))
-test.fail_test(not os.path.exists(test.workpath('classes', 'com', 'sub', 'foo', 'Example2.class')))
+test.fail_test(not os.path.exists(test.workpath('classes', 'com', 'other', 'Example2.class')))
test.fail_test(not os.path.exists(test.workpath('classes', 'com', 'sub', 'foo', 'Example3.class')))
test.fail_test(not os.path.exists(test.workpath('classes', 'com', 'sub', 'bar', 'Example4.class')))
-test.fail_test(not os.path.exists(test.workpath('classes', 'com', 'sub', 'bar', 'Example5.class')))
+test.fail_test(not os.path.exists(test.workpath('classes', 'com', 'other', 'Example5.class')))
test.fail_test(not os.path.exists(test.workpath('classes', 'com', 'sub', 'bar', 'Example6.class')))
test.up_to_date(arguments = '.')