commit dac348c8c96a05f4ce543867c8a026622dc5b79b
author Alexander Aprelev <aam@google.com> Wed Aug 08 00:38:52 2018 +0000
committer Alexander Aprelev <aam@google.com> Wed Aug 08 00:38:52 2018 +0000
tree 2ff1d40e4de049580e3bcea386893b078e7825a7
parent 4d156f9fb08822d54b2b865c83d8a5ca23e4c89e

[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 <aam@google.com>
Reviewed-by: Ryan Macnak <rmacnak@google.com>

runtime/observatory/tests/service/get_object_rpc_test.dart

diff --git a/runtime/observatory/tests/service/get_object_rpc_test.dart b/runtime/observatory/tests/service/get_object_rpc_test.dart
index 7734057..5fb77ec 100644
--- a/runtime/observatory/tests/service/get_object_rpc_test.dart
+++ b/runtime/observatory/tests/service/get_object_rpc_test.dart
@@ -885,15 +885,27 @@
     expect(result['_guardLength'], isNotNull);
   },
 
-  // field
+  // field with guards
   (Isolate isolate) async {
+    var result = await isolate.vm.invokeRpcNoUpgrade('getFlagList', {});
+    var use_field_guards = false;
+    for (var flag in result['flags']) {
+      if (flag['name'] == 'use_field_guards') {
+        use_field_guards = flag['valueAsString'] == 'true';
+        break;
+      }
+    }
+    if (!use_field_guards) {
+      return; // skip the test if guards are not enabled(like on simdbc64)
+    }
+
     // Call eval to get a class id.
     var evalResult = await eval(isolate, 'new _DummyClass()');
     var id = "${evalResult['class']['id']}/fields/dummyList";
     var params = {
       'objectId': id,
     };
-    var result = await isolate.invokeRpcNoUpgrade('getObject', params);
+    result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Field'));
     expect(result['id'], equals(id));
     expect(result['name'], equals('dummyList'));