[Tracing] Minor bugs fix.

test/cctest/libplatform/test-tracing.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include <limits>
 
 #include "include/libplatform/v8-tracing.h"
 #include "src/tracing/trace-event.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
@@ skipping 199 matching lines @@
   int16_t gg = -77;
   signed char hh = -88;
   bool ii1 = true;
   bool ii2 = false;
   double jj1 = 99.0;
   double jj2 = 1e100;
   double jj3 = std::numeric_limits<double>::quiet_NaN();
   double jj4 = std::numeric_limits<double>::infinity();
   double jj5 = -std::numeric_limits<double>::infinity();
   void* kk = &aa;
-  const char* ll = "100";
+  const char* ll = "\"100\"";
   std::string mm = "INIT";
+  std::string mmm = "\"INIT\"";
 
   // Create a scope for the tracing controller to terminate the trace writer.
   {
     TracingController tracing_controller;
     platform::SetTracingController(default_platform, &tracing_controller);
     TraceWriter* writer = TraceWriter::CreateJSONTraceWriter(stream);
 
     TraceBuffer* ring_buffer =
         TraceBuffer::CreateTraceBufferRingBuffer(1, writer);
     tracing_controller.Initialize(ring_buffer);
@@ skipping 11 matching lines @@
     TRACE_EVENT1("v8", "v8.Test.hh", "hh", hh);
     TRACE_EVENT1("v8", "v8.Test.ii", "ii1", ii1);
     TRACE_EVENT1("v8", "v8.Test.ii", "ii2", ii2);
     TRACE_EVENT1("v8", "v8.Test.jj1", "jj1", jj1);
     TRACE_EVENT1("v8", "v8.Test.jj2", "jj2", jj2);
     TRACE_EVENT1("v8", "v8.Test.jj3", "jj3", jj3);
     TRACE_EVENT1("v8", "v8.Test.jj4", "jj4", jj4);
     TRACE_EVENT1("v8", "v8.Test.jj5", "jj5", jj5);
     TRACE_EVENT1("v8", "v8.Test.kk", "kk", kk);
     TRACE_EVENT1("v8", "v8.Test.ll", "ll", ll);
-    TRACE_EVENT1("v8", "v8.Test.mm", "mm", TRACE_STR_COPY(mm.c_str()));
+    TRACE_EVENT1("v8", "v8.Test.mm", "mm", TRACE_STR_COPY(mmm.c_str()));
 
     TRACE_EVENT2("v8", "v8.Test2.1", "aa", aa, "ll", ll);
-    TRACE_EVENT2("v8", "v8.Test2.2", "mm1", TRACE_STR_COPY(mm.c_str()), "mm2",
-                 TRACE_STR_COPY(mm.c_str()));
+    TRACE_EVENT2("v8", "v8.Test2.2", "mm1", TRACE_STR_COPY(mmm.c_str()), "mm2",
+                 TRACE_STR_COPY(mmm.c_str()));
 
     // Check copies are correct.
     TRACE_EVENT_COPY_INSTANT0("v8", mm.c_str(), TRACE_EVENT_SCOPE_THREAD);
     TRACE_EVENT_COPY_INSTANT1("v8", mm.c_str(), TRACE_EVENT_SCOPE_THREAD,
-                              mm.c_str(), mm.c_str());
+                              mm.c_str(), mmm.c_str());
     TRACE_EVENT_COPY_INSTANT2("v8", mm.c_str(), TRACE_EVENT_SCOPE_THREAD,
-                              mm.c_str(), mm.c_str(), mm.c_str(), mm.c_str());
+                              mm.c_str(), mmm.c_str(), mm.c_str(), mmm.c_str());
     mm = "CHANGED";
+    mmm = "CHANGED";
 
     tracing_controller.StopTracing();
   }
 
   std::string trace_str = stream.str();
 
   std::vector<std::string> all_args, all_names, all_cats;
   GetJSONStrings(all_args, trace_str, "\"args\"", "{", "}");
   GetJSONStrings(all_names, trace_str, "\"name\"", "\"", "\"");
   GetJSONStrings(all_cats, trace_str, "\"cat\"", "\"", "\"");
@@ skipping 29 matching lines @@
   CHECK_EQ(all_args[21], "\"INIT\":\"INIT\"");
   CHECK_EQ(all_names[22], "INIT");
   CHECK_EQ(all_args[22], "\"INIT\":\"INIT\",\"INIT\":\"INIT\"");
 
   i::V8::SetPlatformForTesting(old_platform);
 }
 
 }  // namespace tracing
 }  // namespace platform
 }  // namespace v8