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 <memory> | 5 #include <memory> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/environment.h" | 8 #include "base/environment.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
11 #include "base/win/windows_version.h" | |
12 #include "build/build_config.h" | 11 #include "build/build_config.h" |
13 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
14 #include "chrome/test/ppapi/ppapi_test.h" | 13 #include "chrome/test/ppapi/ppapi_test.h" |
15 #include "components/nacl/common/nacl_switches.h" | 14 #include "components/nacl/common/nacl_switches.h" |
16 | 15 |
| 16 #if defined(OS_WIN) |
| 17 #include "base/win/windows_version.h" |
| 18 #endif |
| 19 |
17 static const base::FilePath::CharType kMockNaClGdb[] = | 20 static const base::FilePath::CharType kMockNaClGdb[] = |
18 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
19 FILE_PATH_LITERAL("mock_nacl_gdb.exe"); | 22 FILE_PATH_LITERAL("mock_nacl_gdb.exe"); |
20 #else | 23 #else |
21 FILE_PATH_LITERAL("mock_nacl_gdb"); | 24 FILE_PATH_LITERAL("mock_nacl_gdb"); |
22 #endif | 25 #endif |
23 | 26 |
24 class NaClGdbTest : public PPAPINaClNewlibTest { | 27 class NaClGdbTest : public PPAPINaClNewlibTest { |
25 public: | 28 public: |
26 NaClGdbTest() { | 29 NaClGdbTest() { |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 | 77 |
75 // Fails on the ASAN test bot. See http://crbug.com/122219 | 78 // Fails on the ASAN test bot. See http://crbug.com/122219 |
76 #if defined(ADDRESS_SANITIZER) | 79 #if defined(ADDRESS_SANITIZER) |
77 #define MAYBE_Empty DISABLED_Empty | 80 #define MAYBE_Empty DISABLED_Empty |
78 #else | 81 #else |
79 #define MAYBE_Empty Empty | 82 #define MAYBE_Empty Empty |
80 #endif | 83 #endif |
81 IN_PROC_BROWSER_TEST_F(NaClGdbTest, MAYBE_Empty) { | 84 IN_PROC_BROWSER_TEST_F(NaClGdbTest, MAYBE_Empty) { |
82 RunWithNaClGdb("Empty"); | 85 RunWithNaClGdb("Empty"); |
83 } | 86 } |
OLD | NEW |