OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/environment.h" | 6 #include "base/environment.h" |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/win/windows_version.h" | 9 #include "base/win/windows_version.h" |
10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
11 #include "chrome/test/ppapi/ppapi_test.h" | 11 #include "chrome/test/ppapi/ppapi_test.h" |
| 12 #include "components/nacl/common/nacl_switches.h" |
12 | 13 |
13 static const base::FilePath::CharType kMockNaClGdb[] = | 14 static const base::FilePath::CharType kMockNaClGdb[] = |
14 #if defined(OS_WIN) | 15 #if defined(OS_WIN) |
15 FILE_PATH_LITERAL("mock_nacl_gdb.exe"); | 16 FILE_PATH_LITERAL("mock_nacl_gdb.exe"); |
16 #else | 17 #else |
17 FILE_PATH_LITERAL("mock_nacl_gdb"); | 18 FILE_PATH_LITERAL("mock_nacl_gdb"); |
18 #endif | 19 #endif |
19 | 20 |
20 class NaClGdbTest : public PPAPINaClNewlibTest { | 21 class NaClGdbTest : public PPAPINaClNewlibTest { |
21 public: | 22 public: |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 | 71 |
71 // Fails on the ASAN test bot. See http://crbug.com/122219 | 72 // Fails on the ASAN test bot. See http://crbug.com/122219 |
72 #if defined(ADDRESS_SANITIZER) | 73 #if defined(ADDRESS_SANITIZER) |
73 #define MAYBE_Empty DISABLED_Empty | 74 #define MAYBE_Empty DISABLED_Empty |
74 #else | 75 #else |
75 #define MAYBE_Empty Empty | 76 #define MAYBE_Empty Empty |
76 #endif | 77 #endif |
77 IN_PROC_BROWSER_TEST_F(NaClGdbTest, MAYBE_Empty) { | 78 IN_PROC_BROWSER_TEST_F(NaClGdbTest, MAYBE_Empty) { |
78 RunWithNaClGdb("Empty"); | 79 RunWithNaClGdb("Empty"); |
79 } | 80 } |
OLD | NEW |