Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(497)

Side by Side Diff: chrome/test/remoting/webapp_javascript_unittest.cc

Issue 1634163002: Disabling flaky Remoting_Webapp_Js_Unittest on Linux Tests (dbg)(1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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): https://crbug.com/504204. 15 // Flakily times out on Win7 Tests (dbg) and Linux Tests (dbg)(1):
16 #if defined(OS_WIN) && !defined(NDEBUG) 16 // https://crbug.com/504204.
17 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NDEBUG)
17 #define MAYBE_Remoting_Webapp_Js_Unittest DISABLED_Remoting_Webapp_Js_Unittest 18 #define MAYBE_Remoting_Webapp_Js_Unittest DISABLED_Remoting_Webapp_Js_Unittest
18 #else 19 #else
19 #define MAYBE_Remoting_Webapp_Js_Unittest Remoting_Webapp_Js_Unittest 20 #define MAYBE_Remoting_Webapp_Js_Unittest Remoting_Webapp_Js_Unittest
20 #endif 21 #endif
21 IN_PROC_BROWSER_TEST_F(QUnitBrowserTestRunner, 22 IN_PROC_BROWSER_TEST_F(QUnitBrowserTestRunner,
22 MAYBE_Remoting_Webapp_Js_Unittest) { 23 MAYBE_Remoting_Webapp_Js_Unittest) {
23 base::FilePath base_dir; 24 base::FilePath base_dir;
24 ASSERT_TRUE(PathService::Get(base::DIR_EXE, &base_dir)); 25 ASSERT_TRUE(PathService::Get(base::DIR_EXE, &base_dir));
25 26
26 #if defined(OS_MACOSX) 27 #if defined(OS_MACOSX)
27 if (base::mac::AmIBundled()) { 28 if (base::mac::AmIBundled()) {
28 // If we are inside a mac bundle, navigate up to the output directory 29 // If we are inside a mac bundle, navigate up to the output directory
29 base_dir = base::mac::GetAppBundlePath(base_dir).DirName(); 30 base_dir = base::mac::GetAppBundlePath(base_dir).DirName();
30 } 31 }
31 #endif // !defined(OS_MACOSX) 32 #endif // !defined(OS_MACOSX)
32 RunTest( 33 RunTest(
33 base_dir.Append(FILE_PATH_LITERAL("remoting/unittests/unittests.html"))); 34 base_dir.Append(FILE_PATH_LITERAL("remoting/unittests/unittests.html")));
34 } 35 }
35 36
36 } // namespace remoting 37 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698