comparison mx/mx_graal.py @ 18327:13273385abb5

Merge.
author Doug Simon <doug.simon@oracle.com>
date Mon, 10 Nov 2014 18:18:42 +0100
parents 840257b6cdc5 229dc0d72f2f
children ddd7829c45b1
comparison
equal deleted inserted replaced
18326:840257b6cdc5 18327:13273385abb5
1957 1957
1958 for suite in matchedSuites: 1958 for suite in matchedSuites:
1959 absoluteMicro = os.path.join(jmhPath, suite) 1959 absoluteMicro = os.path.join(jmhPath, suite)
1960 (pfx, exe, vm, forkedVmArgs, _) = _parseVmArgs(vmArgs) 1960 (pfx, exe, vm, forkedVmArgs, _) = _parseVmArgs(vmArgs)
1961 if pfx: 1961 if pfx:
1962 mx.warn("JMH ignores prefix: \"" + pfx + "\"") 1962 mx.log("JMH ignores prefix: \"" + ' '.join(pfx) + "\"")
1963 javaArgs = ['-jar', os.path.join(absoluteMicro, "target", "microbenchmarks.jar"), 1963 javaArgs = ['-jar', os.path.join(absoluteMicro, "target", "microbenchmarks.jar"),
1964 '--jvm', exe, 1964 '--jvm', exe,
1965 '--jvmArgs', ' '.join(["-" + vm] + forkedVmArgs)] 1965 '--jvmArgs', ' '.join(["-" + vm] + forkedVmArgs)]
1966 for k, v in jmhArgs.iteritems(): 1966 for k, v in jmhArgs.iteritems():
1967 javaArgs.append(k) 1967 javaArgs.append(k)