Chromium Code Reviews| Index: base/profiler/stack_sampling_profiler_unittest.cc |
| diff --git a/base/profiler/stack_sampling_profiler_unittest.cc b/base/profiler/stack_sampling_profiler_unittest.cc |
| index 1426f4647f6154efc8faebe10f071927ae762dbc..82d0e247b30a4f6a54f14243379e0b88997dc5ea 100644 |
| --- a/base/profiler/stack_sampling_profiler_unittest.cc |
| +++ b/base/profiler/stack_sampling_profiler_unittest.cc |
| @@ -2,8 +2,11 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| +#include <stdlib.h> |
|
Mike Wittman
2015/09/15 21:21:02
we no longer need this
sydli
2015/09/15 21:49:43
Done.
|
| + |
| #include "base/bind.h" |
| #include "base/compiler_specific.h" |
| +#include "base/files/file_util.h" |
| #include "base/memory/scoped_vector.h" |
| #include "base/message_loop/message_loop.h" |
| #include "base/path_service.h" |
| @@ -16,8 +19,8 @@ |
| #include "testing/gtest/include/gtest/gtest.h" |
| // STACK_SAMPLING_PROFILER_SUPPORTED is used to conditionally enable the tests |
| -// below for supported platforms (currently Win x64). |
| -#if defined(_WIN64) |
| +// below for supported platforms (currently Win x64 and Mac). |
| +#if defined(_WIN64) || defined(OS_MACOSX) |
| #define STACK_SAMPLING_PROFILER_SUPPORTED 1 |
| #endif |
| @@ -256,7 +259,8 @@ TEST(StackSamplingProfilerTest, MAYBE_Basic) { |
| << FormatSampleForDiagnosticOutput(sample, profile.modules); |
| FilePath executable_path; |
| EXPECT_TRUE(PathService::Get(FILE_EXE, &executable_path)); |
| - EXPECT_EQ(executable_path, profile.modules[loc->module_index].filename); |
| + EXPECT_EQ(executable_path, |
| + MakeAbsoluteFilePath(profile.modules[loc->module_index].filename)); |
| } |
| // Checks that the fire-and-forget interface works. |