Skip to content

Commit dac348c

Browse files
committed
[observatory] Only run field guards test if it is enabled in the vm.
Change-Id: I83c5dba9b85fc0f99585fbd90cdc66d8c3fb865b Reviewed-on: https://dart-review.googlesource.com/68850 Commit-Queue: Alexander Aprelev <[email protected]> Reviewed-by: Ryan Macnak <[email protected]>
1 parent 4d156f9 commit dac348c

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

runtime/observatory/tests/service/get_object_rpc_test.dart

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -885,15 +885,27 @@ var tests = <IsolateTest>[
885885
expect(result['_guardLength'], isNotNull);
886886
},
887887

888-
// field
889-
(Isolate isolate) async {
888+
// field with guards
889+
(Isolate isolate) async {
890+
var result = await isolate.vm.invokeRpcNoUpgrade('getFlagList', {});
891+
var use_field_guards = false;
892+
for (var flag in result['flags']) {
893+
if (flag['name'] == 'use_field_guards') {
894+
use_field_guards = flag['valueAsString'] == 'true';
895+
break;
896+
}
897+
}
898+
if (!use_field_guards) {
899+
return; // skip the test if guards are not enabled(like on simdbc64)
900+
}
901+
890902
// Call eval to get a class id.
891903
var evalResult = await eval(isolate, 'new _DummyClass()');
892904
var id = "${evalResult['class']['id']}/fields/dummyList";
893905
var params = {
894906
'objectId': id,
895907
};
896-
var result = await isolate.invokeRpcNoUpgrade('getObject', params);
908+
result = await isolate.invokeRpcNoUpgrade('getObject', params);
897909
expect(result['type'], equals('Field'));
898910
expect(result['id'], equals(id));
899911
expect(result['name'], equals('dummyList'));

0 commit comments

Comments
 (0)