Mercurial > hg > truffle
comparison mx/mx_graal.py @ 13277:ce017d1e4234
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 09 Dec 2013 17:31:12 +0100 |
parents | 58d8de1f384b |
children | d8692e751c65 |
comparison
equal
deleted
inserted
replaced
13276:06afa0db90b3 | 13277:ce017d1e4234 |
---|---|
979 unittest([]) | 979 unittest([]) |
980 tasks.append(t.stop()) | 980 tasks.append(t.stop()) |
981 | 981 |
982 for vmbuild in ['fastdebug', 'product']: | 982 for vmbuild in ['fastdebug', 'product']: |
983 for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild): | 983 for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild): |
984 if 'eclipse' in str(test) and mx.java().version >= mx.JavaVersion('1.8'): | |
985 # DaCapo eclipse doesn't not run under JDK8 | |
986 continue | |
987 | |
984 t = Task(str(test) + ':' + vmbuild) | 988 t = Task(str(test) + ':' + vmbuild) |
985 if not test.test('graal'): | 989 if not test.test('graal'): |
986 t.abort(test.name + ' Failed') | 990 t.abort(test.name + ' Failed') |
987 tasks.append(t.stop()) | 991 tasks.append(t.stop()) |
988 | 992 |
1130 mx.logv('[This initial execution may take a while as the NetBeans platform needs to be downloaded]') | 1134 mx.logv('[This initial execution may take a while as the NetBeans platform needs to be downloaded]') |
1131 mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-l', fp.name, 'run']) | 1135 mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-l', fp.name, 'run']) |
1132 | 1136 |
1133 def igv(args): | 1137 def igv(args): |
1134 """run the Ideal Graph Visualizer""" | 1138 """run the Ideal Graph Visualizer""" |
1139 env = os.environ.copy() | |
1140 if mx.java().version >= mx.JavaVersion('1.8'): | |
1141 jdk7 = mx.get_env('JAVA7_HOME', None) | |
1142 if jdk7: | |
1143 env['JAVA_HOME'] = jdk7 | |
1144 else: | |
1145 mx.abort('IGV does not yet work with JDK 8. Use --java-home to specify a JDK 7 when launching the IGV') | |
1135 with open(join(_graal_home, '.ideal_graph_visualizer.log'), 'w') as fp: | 1146 with open(join(_graal_home, '.ideal_graph_visualizer.log'), 'w') as fp: |
1136 mx.logv('[Ideal Graph Visualizer log is in ' + fp.name + ']') | 1147 mx.logv('[Ideal Graph Visualizer log is in ' + fp.name + ']') |
1137 if not exists(join(_graal_home, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'nbplatform')): | 1148 if not exists(join(_graal_home, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'nbplatform')): |
1138 mx.logv('[This initial execution may take a while as the NetBeans platform needs to be downloaded]') | 1149 mx.logv('[This initial execution may take a while as the NetBeans platform needs to be downloaded]') |
1139 mx.run(['ant', '-f', join(_graal_home, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'build.xml'), '-l', fp.name, 'run']) | 1150 mx.run(['ant', '-f', join(_graal_home, 'src', 'share', 'tools', 'IdealGraphVisualizer', 'build.xml'), '-l', fp.name, 'run'], env=env) |
1140 | 1151 |
1141 def bench(args): | 1152 def bench(args): |
1142 """run benchmarks and parse their output for results | 1153 """run benchmarks and parse their output for results |
1143 | 1154 |
1144 Results are JSON formated : {group : {benchmark : score}}.""" | 1155 Results are JSON formated : {group : {benchmark : score}}.""" |