summaryrefslogtreecommitdiffstats
path: root/test/Repository
diff options
context:
space:
mode:
authorDaniel Moody <dmoody256@gmail.com>2018-05-25 21:30:38 (GMT)
committerDaniel Moody <dmoody256@gmail.com>2018-05-25 21:44:47 (GMT)
commitea6fc1fcb2de8a99a7f8a68d51f5969cdc729d2c (patch)
treeee9cf17a72c167fd174009112ccbb097e4abab9a /test/Repository
parentcf74ad1fc7b745f8dfcf5886aa5e0326d104caa0 (diff)
downloadSCons-ea6fc1fcb2de8a99a7f8a68d51f5969cdc729d2c.zip
SCons-ea6fc1fcb2de8a99a7f8a68d51f5969cdc729d2c.tar.gz
SCons-ea6fc1fcb2de8a99a7f8a68d51f5969cdc729d2c.tar.bz2
pr-3052: fixed some missing quotes for some tests that use the new default java tests for windows
Diffstat (limited to 'test/Repository')
-rw-r--r--test/Repository/Java.py2
-rw-r--r--test/Repository/JavaH.py8
-rw-r--r--test/Repository/RMIC.py8
3 files changed, 9 insertions, 9 deletions
diff --git a/test/Repository/Java.py b/test/Repository/Java.py
index fce85cd..290d742 100644
--- a/test/Repository/Java.py
+++ b/test/Repository/Java.py
@@ -59,7 +59,7 @@ opts = '-Y ' + test.workpath('rep1')
#
test.write(['rep1', 'SConstruct'], """
env = Environment(tools = ['javac'],
- JAVAC = r'%s')
+ JAVAC = r'"%s"')
env.Java(target = 'classes', source = 'src')
""" % javac)
diff --git a/test/Repository/JavaH.py b/test/Repository/JavaH.py
index ee196cf..1cb5078 100644
--- a/test/Repository/JavaH.py
+++ b/test/Repository/JavaH.py
@@ -63,8 +63,8 @@ opts = '-Y ' + test.workpath('rep1')
#
test.write(['rep1', 'SConstruct'], """
env = Environment(tools = ['javac', 'javah'],
- JAVAC = r'%s',
- JAVAH = r'%s')
+ JAVAC = r'"%s"',
+ JAVAH = r'"%s"')
classes = env.Java(target = 'classes', source = 'src')
env.JavaH(target = 'outdir', source = classes)
""" % (javac, javah))
@@ -207,8 +207,8 @@ test.up_to_date(chdir = 'work2', options = opts, arguments = ".")
#
test.write(['work3', 'SConstruct'], """
env = Environment(tools = ['javac', 'javah'],
- JAVAC = r'%s',
- JAVAH = r'%s')
+ JAVAC = r'"%s"',
+ JAVAH = r'"%s"')
classes = env.Java(target = 'classes', source = 'src')
hfiles = env.JavaH(target = 'outdir', source = classes)
Local(hfiles)
diff --git a/test/Repository/RMIC.py b/test/Repository/RMIC.py
index 886ccdb..392e6ef 100644
--- a/test/Repository/RMIC.py
+++ b/test/Repository/RMIC.py
@@ -82,8 +82,8 @@ opts = '-Y ' + test.workpath('rep1')
#
test.write(['rep1', 'SConstruct'], """
env = Environment(tools = ['javac', 'rmic'],
- JAVAC = r'%s',
- RMIC = r'%s')
+ JAVAC = r'"%s"',
+ RMIC = r'"%s"')
classes = env.Java(target = 'classes', source = 'src')
# Brute-force removal of the "Hello" class.
classes = [c for c in classes if str(c).find('Hello') == -1]
@@ -350,8 +350,8 @@ test.up_to_date(chdir = 'work2', options = opts, arguments = ".")
#
test.write(['work3', 'SConstruct'], """
env = Environment(tools = ['javac', 'rmic'],
- JAVAC = r'%s',
- RMIC = r'%s')
+ JAVAC = r'"%s"',
+ RMIC = r'"%s"')
classes = env.Java(target = 'classes', source = 'src')
# Brute-force removal of the "Hello" class.
classes = [c for c in classes if str(c).find('Hello') == -1]