Skip to content

Commit 962f1aa

Browse files
committed
Fix importing CE dependencies in bisect script
1 parent a55dc89 commit 962f1aa

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

mx.graalpython/mx_graalpython_bisect.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ def _bisect_benchmark(argv, initial_branch, email_to):
204204
def benchmark_callback(suite, commit):
205205
suite.vc.update_to_branch(suite.vc_dir, commit)
206206
mx.run_mx(['sforceimports'], suite=suite)
207+
mx.run_mx(['--env', 'ce', 'sforceimports'], suite=get_suite('/vm'))
207208
if args.enterprise and suite.name != 'vm-enterprise':
208209
checkout_args = ['--dynamicimports', '/vm-enterprise', 'checkout-downstream', 'vm', 'vm-enterprise']
209210
if fetched_enterprise[0]:
@@ -215,8 +216,11 @@ def benchmark_callback(suite, commit):
215216
fetched_enterprise[0] = True
216217
suite.vc.update_to_branch(suite.vc_dir, commit)
217218
mx.run_mx(['sforceimports'], suite=suite)
218-
print("debug: graalpython={} graal={} graal-enterprise={}"
219-
.format(*(get_commit(get_suite(s)) for s in ('graalpython', '/vm', '/vm-enterprise'))))
219+
debug_str = "debug: graalpython={} graal={}".format(
220+
get_commit(get_suite('graalpython')), get_commit(get_suite('/vm')))
221+
if args.enterprise:
222+
debug_str += " graal-enterprise={}".format(get_commit(get_suite('/vm-enterprise')))
223+
print(debug_str)
220224
env = os.environ.copy()
221225
env['MX_ALT_OUTPUT_ROOT'] = 'mxbuild-{}'.format(commit)
222226
retcode = mx.run(shlex.split(args.build_command), env=env, nonZeroIsFatal=False)

0 commit comments

Comments
 (0)