OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/path_service.h" | 5 #include "base/path_service.h" |
6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
7 #include "chrome/test/remoting/qunit_browser_test_runner.h" | 7 #include "chrome/test/remoting/qunit_browser_test_runner.h" |
8 | 8 |
9 #if defined(OS_MACOSX) | 9 #if defined(OS_MACOSX) |
10 #include "base/mac/foundation_util.h" | 10 #include "base/mac/foundation_util.h" |
11 #endif // !defined(OS_MACOSX) | 11 #endif // !defined(OS_MACOSX) |
12 | 12 |
13 namespace remoting { | 13 namespace remoting { |
14 | 14 |
15 // Flakily times out on Win7 Tests (dbg) and Linux Tests (dbg)(1): | 15 // Flakily times out on Win7 Tests (dbg) and Linux Tests (dbg)(1): |
16 // https://crbug.com/504204. | 16 // https://crbug.com/504204. Recently completely broken on |
17 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NDEBUG) | 17 // Linux: https://crbug.com/582005 |
18 #define MAYBE_Remoting_Webapp_Js_Unittest DISABLED_Remoting_Webapp_Js_Unittest | |
19 #else | |
20 #define MAYBE_Remoting_Webapp_Js_Unittest Remoting_Webapp_Js_Unittest | |
21 #endif | |
22 IN_PROC_BROWSER_TEST_F(QUnitBrowserTestRunner, | 18 IN_PROC_BROWSER_TEST_F(QUnitBrowserTestRunner, |
23 MAYBE_Remoting_Webapp_Js_Unittest) { | 19 DISABLED_Remoting_Webapp_Js_Unittest) { |
24 base::FilePath base_dir; | 20 base::FilePath base_dir; |
25 ASSERT_TRUE(PathService::Get(base::DIR_EXE, &base_dir)); | 21 ASSERT_TRUE(PathService::Get(base::DIR_EXE, &base_dir)); |
26 | 22 |
27 #if defined(OS_MACOSX) | 23 #if defined(OS_MACOSX) |
28 if (base::mac::AmIBundled()) { | 24 if (base::mac::AmIBundled()) { |
29 // If we are inside a mac bundle, navigate up to the output directory | 25 // If we are inside a mac bundle, navigate up to the output directory |
30 base_dir = base::mac::GetAppBundlePath(base_dir).DirName(); | 26 base_dir = base::mac::GetAppBundlePath(base_dir).DirName(); |
31 } | 27 } |
32 #endif // !defined(OS_MACOSX) | 28 #endif // !defined(OS_MACOSX) |
33 RunTest( | 29 RunTest( |
34 base_dir.Append(FILE_PATH_LITERAL("remoting/unittests/unittests.html"))); | 30 base_dir.Append(FILE_PATH_LITERAL("remoting/unittests/unittests.html"))); |
35 } | 31 } |
36 | 32 |
37 } // namespace remoting | 33 } // namespace remoting |
OLD | NEW |