summaryrefslogtreecommitdiffstats
path: root/test/Java
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-01-03 20:35:15 (GMT)
committerSteven Knight <knight@baldmt.com>2005-01-03 20:35:15 (GMT)
commit4faa0280b31792a8ce58c2cc8877c67279a55f6b (patch)
treefca04c48370ff7351b526ad7d815165699088622 /test/Java
parent49766df7a53c47fdc9d30549595efe1cfcd479b0 (diff)
downloadSCons-4faa0280b31792a8ce58c2cc8877c67279a55f6b.zip
SCons-4faa0280b31792a8ce58c2cc8877c67279a55f6b.tar.gz
SCons-4faa0280b31792a8ce58c2cc8877c67279a55f6b.tar.bz2
Win32 portability fixes.
Diffstat (limited to 'test/Java')
-rw-r--r--test/Java/JAVACCOMSTR.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/test/Java/JAVACCOMSTR.py b/test/Java/JAVACCOMSTR.py
index 306ae57..7f59e90 100644
--- a/test/Java/JAVACCOMSTR.py
+++ b/test/Java/JAVACCOMSTR.py
@@ -29,6 +29,8 @@ Test that the $JAVACCOMSTR construction variable allows you to configure
the javac output.
"""
+import os.path
+
import TestSCons
python = TestSCons.python
@@ -60,9 +62,14 @@ test.write(['src', 'file1.java'], "file1.java\n/*javac*/\n")
test.write(['src', 'file2.java'], "file2.java\n/*javac*/\n")
test.write(['src', 'file3.java'], "file3.java\n/*javac*/\n")
+classes_src_file1_class = os.path.join('classes', 'src', 'file1.class')
+src_file1_java= os.path.join('src', 'file1.java')
+src_file2_java= os.path.join('src', 'file2.java')
+src_file3_java= os.path.join('src', 'file3.java')
+
test.run(stdout = test.wrap_stdout("""\
-Compiling class(es) classes/src/file1.class from src/file1.java src/file2.java src/file3.java
-"""))
+Compiling class(es) %(classes_src_file1_class)s from %(src_file1_java)s %(src_file2_java)s %(src_file3_java)s
+""" % locals()))
test.must_match(['classes', 'src', 'file1.class'],
"file1.java\nfile2.java\nfile3.java\n")