Skip to content

Commit cd4954b

Browse files
committed
[GR-68646] Ensure FileSizeBenchmark runs on --jvm=server.
PullRequest: graal/21832
2 parents dab231f + a3428da commit cd4954b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

vm/ci/ci_common/common-runspec.jsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object}
125125
},
126126
}),
127127

128-
local record_file_sizes = ['benchmark', 'file-size:*', '--results-file', 'sizes.json'],
128+
local record_file_sizes = ['benchmark', 'file-size:*', '--results-file', 'sizes.json', '--', '--jvm', 'server'],
129129
local upload_file_sizes = ['bench-uploader.py', 'sizes.json'],
130130

131131
local mx_env = task_spec({
@@ -255,4 +255,4 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object}
255255
deploy_vm_base_task_dict,
256256
deploy_vm_espresso_task_dict,
257257
]]), std.thisFile),
258-
}
258+
}

vm/ci/ci_common/common.jsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ local devkits = graal_common.devkits;
477477
},
478478
},
479479

480-
record_file_sizes:: ['benchmark', 'file-size:*', '--results-file', 'sizes.json'],
480+
record_file_sizes:: ['benchmark', 'file-size:*', '--results-file', 'sizes.json', '--', '--jvm', 'server'],
481481
upload_file_sizes:: ['bench-uploader.py', 'sizes.json'],
482482

483483
build_base_graalvm_image: [
@@ -539,7 +539,7 @@ local devkits = graal_common.devkits;
539539
+ $.deploy_standalones(self.os, self.tags)
540540
+ (
541541
if (record_file_sizes) then [
542-
$.mx_vm_complete + $.record_file_sizes + ['--', '--', 'standalones'],
542+
$.mx_vm_complete + $.record_file_sizes + ['--', 'standalones'],
543543
$.upload_file_sizes,
544544
] else []
545545
),

0 commit comments

Comments
 (0)