summaryrefslogtreecommitdiffstats
path: root/test/Java/JAVACFLAGS.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2006-02-12 19:56:03 (GMT)
committerSteven Knight <knight@baldmt.com>2006-02-12 19:56:03 (GMT)
commit92e52b195125e7fc89721570c0b9237105d635da (patch)
tree56208f374c81c91b572cd0fc3cf28223ef80a732 /test/Java/JAVACFLAGS.py
parent7bc5b0f51a17b8ea1e49cfe917a98610791d67aa (diff)
downloadSCons-92e52b195125e7fc89721570c0b9237105d635da.zip
SCons-92e52b195125e7fc89721570c0b9237105d635da.tar.gz
SCons-92e52b195125e7fc89721570c0b9237105d635da.tar.bz2
Add support for Visual Studio 2005 Professional. Windows portability fixes for various tests. (Baptiste Lepilleur)
Diffstat (limited to 'test/Java/JAVACFLAGS.py')
-rw-r--r--test/Java/JAVACFLAGS.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/test/Java/JAVACFLAGS.py b/test/Java/JAVACFLAGS.py
index a237e91..045fb7b 100644
--- a/test/Java/JAVACFLAGS.py
+++ b/test/Java/JAVACFLAGS.py
@@ -24,7 +24,8 @@
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-import os.path
+import os
+import string
import TestSCons
@@ -43,7 +44,7 @@ test.subdir('src')
test.write('SConstruct', """
env = Environment(tools = ['javac'],
- JAVAC = '%(where_javac)s',
+ JAVAC = r'%(where_javac)s',
JAVACFLAGS = '-O')
env.Java(target = 'classes', source = 'src')
""" % locals())
@@ -62,8 +63,10 @@ public class Example1
}
""")
+expected_wrapper_out = "%(where_javac)s -O -d classes -sourcepath src src/Example1.java\n"
+expected_wrapper_out = string.replace(expected_wrapper_out, '/', os.sep)
test.run(arguments = '.',
- stdout = test.wrap_stdout("%(where_javac)s -O -d classes -sourcepath src src/Example1.java\n" % locals()))
+ stdout = test.wrap_stdout(expected_wrapper_out % locals()))
test.must_exist(['classes', 'src', 'Example1.class'])