diff options
| author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 23:18:06 +0000 |
|---|---|---|
| committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 23:18:06 +0000 |
| commit | 1d79d09d3711a1cdd77ec5beef8d0ae304d73e50 (patch) | |
| tree | 4c34bc2772fd53039dba7d770f7168f9a8543c91 /base/debug/trace_event_unittest.cc | |
| parent | 07c8b9974ba600ab4843b8c5c20016707281fd54 (diff) | |
| download | chromium_src-1d79d09d3711a1cdd77ec5beef8d0ae304d73e50.zip chromium_src-1d79d09d3711a1cdd77ec5beef8d0ae304d73e50.tar.gz chromium_src-1d79d09d3711a1cdd77ec5beef8d0ae304d73e50.tar.bz2 | |
Make TraceEventTestFixture.ThreadNames work when thread-id is reused.
R=nduca,jar
Review URL: http://codereview.chromium.org/9325040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug/trace_event_unittest.cc')
| -rw-r--r-- | base/debug/trace_event_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc index 8486f90..b756b9a 100644 --- a/base/debug/trace_event_unittest.cc +++ b/base/debug/trace_event_unittest.cc @@ -1066,12 +1066,14 @@ TEST_F(TraceEventTestFixture, ThreadNames) { if(static_cast<int>(thread_ids[j]) != tmp_int) continue; - std::string expected_name = StringPrintf("Thread %d", j).c_str(); + std::string expected_name = StringPrintf("Thread %d", j); EXPECT_TRUE(item->GetString("ph", &tmp) && tmp == "M"); EXPECT_TRUE(item->GetInteger("pid", &tmp_int) && tmp_int == static_cast<int>(base::GetCurrentProcId())); + // If the thread name changes or the tid gets reused, the name will be + // a comma-separated list of thread names, so look for a substring. EXPECT_TRUE(item->GetString("args.name", &tmp) && - tmp == expected_name); + tmp.find(expected_name) != std::string::npos); } } } |