summaryrefslogtreecommitdiffstats
path: root/test/Java/JARCOM.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2016-11-27 23:25:05 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2016-11-27 23:25:05 (GMT)
commit30247efa139711be7f2d7342c01b1c817985df0c (patch)
treeb4360925e1c5102aa58c51b5c68e64d0c01ca84f /test/Java/JARCOM.py
parent3031330216256cbff09b5631fdf68fa75d2439f2 (diff)
parentd938777da7f4b9e908075dabb1554bef9882d60f (diff)
downloadSCons-30247efa139711be7f2d7342c01b1c817985df0c.zip
SCons-30247efa139711be7f2d7342c01b1c817985df0c.tar.gz
SCons-30247efa139711be7f2d7342c01b1c817985df0c.tar.bz2
update from upstream
Diffstat (limited to 'test/Java/JARCOM.py')
-rw-r--r--test/Java/JARCOM.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/test/Java/JARCOM.py b/test/Java/JARCOM.py
index 9d93ba5..9146445 100644
--- a/test/Java/JARCOM.py
+++ b/test/Java/JARCOM.py
@@ -35,20 +35,11 @@ _python_ = TestSCons._python_
test = TestSCons.TestSCons()
-
-test.write('myjar.py', r"""
-import sys
-outfile = open(sys.argv[1], 'wb')
-for f in sys.argv[2:]:
- infile = open(f, 'rb')
- for l in [l for l in infile.readlines() if l != '/*jar*/\n']:
- outfile.write(l)
-sys.exit(0)
-""")
+test.file_fixture('mycompile.py')
test.write('SConstruct', """
env = Environment(TOOLS = ['default', 'jar'],
- JARCOM = r'%(_python_)s myjar.py $TARGET $SOURCES')
+ JARCOM = r'%(_python_)s mycompile.py jar $TARGET $SOURCES')
env.Jar(target = 'test1', source = ['file1.in', 'file2.in', 'file3.in'])
""" % locals())
@@ -60,8 +51,6 @@ test.run()
test.must_match('test1.jar', "file1.in\nfile2.in\nfile3.in\n")
-
-
test.pass_test()
# Local Variables: