Fixed tests breaking build.

runtime/vm/thread_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 "platform/assert.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
 #include "vm/unit_test.h"
 #include "vm/profiler.h"
 #include "vm/safepoint.h"
@@ skipping 317 matching lines @@
 
     Thread* current_thread = Thread::Current();
     StackZone stack_zone(current_thread);
     Zone* current_zone = current_thread->zone();
 
     // Check that all zones are present with correct sizes.
     while (top_zone != NULL) {
       char* zone_info_buf =
           OS::SCreate(current_zone,
                       "\"type\":\"_Zone\","
-                      "\"capacity\":%ld,"
-                      "\"used\":%ld",
+                      "\"capacity\":%" Pd
+                      ","
+                      "\"used\":%" Pd "",
                       top_zone->SizeInBytes(), top_zone->UsedSizeInBytes());
       EXPECT_SUBSTRING(zone_info_buf, json);
       top_zone = top_zone->previous();
     }
 
     // Check the thread exists and is the correct size.
-    char* thread_info_buf = OS::SCreate(current_zone,
-                                        "\"type\":\"_Thread\","
-                                        "\"id\":\"threads\\/%" Pd64 "",
-                                        thread->os_thread()->trace_id());
+    char* thread_info_buf = OS::SCreate(
+        current_zone,
+        "\"type\":\"_Thread\","
+        "\"id\":\"threads\\/%" Pd "",
+        OSThread::ThreadIdToIntPtr(thread->os_thread()->trace_id()));
 
     // Ensure the isolate for each thread is valid.
 
     char* isolate_info_buf =
         OS::SCreate(current_zone,
                     "\"type\":\"Isolate\","
                     "\"fixedId\":true,"
                     "\"id\":\"isolates\\/%" Pd64 "",
                     static_cast<int64_t>(thread_isolate->main_port()));
 
@@ skipping 438 matching lines @@
       TransitionVMToBlocked transition(thread);
       MonitorLocker ml(&done_monitor);
       if (done) {
         break;
       }
     }
   }
 }
 
 }  // namespace dart