| Index: test/cctest/libplatform/test-tracing.cc
|
| diff --git a/test/cctest/libplatform/test-tracing.cc b/test/cctest/libplatform/test-tracing.cc
|
| index 5cb788c10097af7aa7036258eff8cd5fb8381de1..9e8a06744352949713a5f61c2ccd357bdb76d4a2 100644
|
| --- a/test/cctest/libplatform/test-tracing.cc
|
| +++ b/test/cctest/libplatform/test-tracing.cc
|
| @@ -128,8 +128,8 @@ TEST(TestJSONTraceWriter) {
|
| TraceObject trace_object;
|
| trace_object.InitializeForTesting(
|
| 'X', tracing_controller.GetCategoryGroupEnabled("v8-cat"), "Test0",
|
| - v8::internal::tracing::kGlobalScope, 42, 123, 0, NULL, NULL, NULL, 0,
|
| - 11, 22, 100, 50, 33, 44);
|
| + v8::internal::tracing::kGlobalScope, 42, 123, 0, NULL, NULL, NULL,
|
| + TRACE_EVENT_FLAG_HAS_ID, 11, 22, 100, 50, 33, 44);
|
| writer->AppendTraceEvent(&trace_object);
|
| trace_object.InitializeForTesting(
|
| 'Y', tracing_controller.GetCategoryGroupEnabled("v8-cat"), "Test1",
|
| @@ -143,9 +143,9 @@ TEST(TestJSONTraceWriter) {
|
| std::string expected_trace_str =
|
| "{\"traceEvents\":[{\"pid\":11,\"tid\":22,\"ts\":100,\"tts\":50,"
|
| "\"ph\":\"X\",\"cat\":\"v8-cat\",\"name\":\"Test0\",\"dur\":33,"
|
| - "\"tdur\":44,\"args\":{}},{\"pid\":55,\"tid\":66,\"ts\":110,\"tts\":55,"
|
| - "\"ph\":\"Y\",\"cat\":\"v8-cat\",\"name\":\"Test1\",\"dur\":77,"
|
| - "\"tdur\":88,\"args\":{}}]}";
|
| + "\"tdur\":44,\"id\":\"0x2a\",\"args\":{}},{\"pid\":55,\"tid\":66,"
|
| + "\"ts\":110,\"tts\":55,\"ph\":\"Y\",\"cat\":\"v8-cat\",\"name\":"
|
| + "\"Test1\",\"dur\":77,\"tdur\":88,\"args\":{}}]}";
|
|
|
| CHECK_EQ(expected_trace_str, trace_str);
|
|
|
|
|