Enable remaining execution tests on x64.

runtime/vm/dart_api_impl_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/thread.h"
 #include "vm/unit_test.h"
 #include "vm/verifier.h"
 
 namespace dart {
 
-#if defined(TARGET_ARCH_IA32)  // only ia32 can run execution tests.
+// Only ia32 and x64 can run execution tests.
+#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 TEST_CASE(ErrorHandles) {
   const char* kScriptChars =
       "class TestClass  {\n"
       "  static void testMain() {\n"
       "    throw new Exception(\"bad news\");\n"
       "  }\n"
       "}\n";
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
@@ skipping 80 matching lines @@
 
     EXPECT_VALID(Dart_IsSame(class1, class1, &same));
     EXPECT(same);
 
     EXPECT_VALID(Dart_IsSame(class1, class2, &same));
     EXPECT(!same);
   }
 }
 
 
-#if defined(TARGET_ARCH_IA32)  // only ia32 can run execution tests.
+// Only ia32 and x64 can run execution tests.
+#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 TEST_CASE(ObjectEquals) {
   bool equal = false;
   Dart_Handle five = Dart_NewString("5");
   Dart_Handle five_again = Dart_NewString("5");
   Dart_Handle seven = Dart_NewString("7");
 
   // Same objects.
   EXPECT_VALID(Dart_ObjectEquals(five, five, &equal));
   EXPECT(equal);
 
   // Equal objects.
   EXPECT_VALID(Dart_ObjectEquals(five, five_again, &equal));
   EXPECT(equal);
 
   // Different objects.
   EXPECT_VALID(Dart_ObjectEquals(five, seven, &equal));
   EXPECT(!equal);
 }
 
 #endif
 
+
 TEST_CASE(BooleanValues) {
   Dart_Handle str = Dart_NewString("test");
   EXPECT(!Dart_IsBoolean(str));
 
   bool value = false;
   Dart_Handle result = Dart_BooleanValue(str, &value);
   EXPECT(Dart_IsError(result));
 
   Dart_Handle val1 = Dart_NewBoolean(true);
   EXPECT(Dart_IsBoolean(val1));
@@ skipping 41 matching lines @@
   double out1, out2;
   Dart_Handle result = Dart_DoubleValue(val1, &out1);
   EXPECT_VALID(result);
   EXPECT_EQ(kDoubleVal1, out1);
   result = Dart_DoubleValue(val2, &out2);
   EXPECT_VALID(result);
   EXPECT_EQ(kDoubleVal2, out2);
 }
 
 
-#if defined(TARGET_ARCH_IA32)  // only ia32 can run execution tests.
+// Only ia32 and x64 can run execution tests.
+#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 TEST_CASE(NumberValues) {
   // TODO(antonm): add various kinds of ints (smi, mint, bigint).
   const char* kScriptChars =
       "class NumberValuesHelper {\n"
       "  static int getInt() { return 1; }\n"
       "  static double getDouble() { return 1.0; }\n"
       "  static bool getBool() { return false; }\n"
       "  static getNull() { return null; }\n"
       "}\n";
@@ skipping 269 matching lines @@
   // Not a String.
   peer = NULL;
   result = Dart_ExternalStringGetPeer(Dart_True(), &peer);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_ExternalStringGetPeer expects argument 'object' to be "
                "of type String.", Dart_GetError(result));
   EXPECT(peer == NULL);
 }
 
 
-#if defined(TARGET_ARCH_IA32)  // only ia32 can run execution tests.
+// Only ia32 and x64 can run execution tests.
+#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 TEST_CASE(ListAccess) {
   const char* kScriptChars =
       "class ListAccessTest {"
       "  ListAccessTest() {}"
       "  static List testMain() {"
       "    List a = new List();"
       "    a.add(10);"
       "    a.add(20);"
       "    a.add(30);"
@@ skipping 98 matching lines @@
   EXPECT_VALID(result);
   result = Dart_IntegerToInt64(result, &value);
   EXPECT_VALID(result);
   EXPECT_EQ(30, value);
 
   // Check if we get an exception when accessing beyond limit.
   result = Dart_ListGetAt(ListAccessTestObj, 4);
   EXPECT(Dart_IsError(result));
 }
 
-#endif  // TARGET_ARCH_IA32.
+#endif
 
 
 // Unit test for entering a scope, creating a local handle and exiting
 // the scope.
 UNIT_TEST_CASE(EnterExitScope) {
   TestIsolateScope __test_isolate__;
 
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   ApiState* state = isolate->api_state();
@@ skipping 101 matching lines @@
 
   // Make sure that the value transferred.
   EXPECT(Dart_IsBoolean(obj2));
   bool value = false;
   Dart_Handle result = Dart_BooleanValue(obj2, &value);
   EXPECT_VALID(result);
   EXPECT(value);
 }
 
 
-#if defined(TARGET_ARCH_IA32)  // only ia32 can run execution tests.
+// Only ia32 and x64 can run execution tests.
+#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 TEST_CASE(WeakPersistentHandle) {
   Dart_Handle weak_new_ref = Dart_Null();
   EXPECT(Dart_IsNull(weak_new_ref));
 
   Dart_Handle weak_old_ref = Dart_Null();
   EXPECT(Dart_IsNull(weak_old_ref));
 
   bool is_same;
 
@@ skipping 277 matching lines @@
 UNIT_TEST_CASE(SetMessageCallbacks) {
   Dart_Isolate dart_isolate = TestCase::CreateTestIsolate();
   Dart_SetMessageCallbacks(&MyPostMessageCallback, &MyClosePortCallback);
   Isolate* isolate = reinterpret_cast<Isolate*>(dart_isolate);
   EXPECT_EQ(&MyPostMessageCallback, isolate->post_message_callback());
   EXPECT_EQ(&MyClosePortCallback, isolate->close_port_callback());
   Dart_ShutdownIsolate();
 }
 
 
-#if defined(TARGET_ARCH_IA32)  // only ia32 can run execution tests.
+// Only ia32 and x64 can run execution tests.
+#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 TEST_CASE(FieldAccess) {
   const char* kScriptChars =
       "class Fields  {\n"
       "  Fields(int i, int j) : fld1 = i, fld2 = j {}\n"
       "  int fld1;\n"
       "  final int fld2;\n"
       "  static int fld3;\n"
       "  static final int fld4 = 10;\n"
       "}\n"
@@ skipping 1957 matching lines @@
     }
   }
 
   // We should have received the expected number of interrupts.
   EXPECT_EQ(kInterruptCount, interrupt_count);
 
   // Give the spawned thread enough time to properly exit.
   Isolate::SetInterruptCallback(saved);
 }
 
-#endif  // TARGET_ARCH_IA32.
+#endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart