Mercurial > hg > truffle

changeset 15051:2df054b37edc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add support for removing default JMH args (e.g., '{"-wi" : null, "-i" : null}')
author Doug Simon <doug.simon@oracle.com>
date Wed, 09 Apr 2014 23:48:22 +0200
parents 90e8e3b90558
children 5e6f29f287d6
files mx/mx_graal.py
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mx/mx_graal.py	Wed Apr 09 21:10:52 2014 +0200
+++ b/mx/mx_graal.py	Wed Apr 09 23:48:22 2014 +0200
@@ -1364,7 +1364,11 @@
     # e.g. '{"-wi" : 20}'
     for j in jmhArgJsons:
         try:
-            jmhArgs.update(json.loads(j))
+            for n, v in json.loads(j).iteritems():
+                if v is None:
+                    del jmhArgs[n]
+                else:
+                    jmhArgs[n] = v
         except ValueError as e:
             mx.abort('error parsing JSON input: {}"\n{}'.format(j, e))
 
@@ -1431,7 +1435,8 @@
                     '--jvmArgs', ' '.join(["-" + vm] + forkedVmArgs)]
         for k, v in jmhArgs.iteritems():
             javaArgs.append(k)
-            javaArgs.append(str(v))
+            if len(str(v)):
+                javaArgs.append(str(v))
         mx.run_java(javaArgs + regex, addDefaultArgs=False, cwd=jmhPath)