Commit 7d2cffad authored by jam@chromium.org's avatar jam@chromium.org

Temporarily disable ChromeMainTest on ChromeOS. These pass locally for me on...

Temporarily disable ChromeMainTest on ChromeOS. These pass locally for me on linux_chromeos builds, but are failing on the bots after r133852.

TBR=sky
Review URL: https://chromiumcodereview.appspot.com/10173020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133872 0039d316-1c4b-4281-b951-d872f2087c98
parent 659bde91
...@@ -25,6 +25,10 @@ ...@@ -25,6 +25,10 @@
// for details. // for details.
#if !defined(OS_MACOSX) #if !defined(OS_MACOSX)
// These tests hang on the build/try bot but pass locally with chromeos=1
// builds. jam is investigatin
#if !defined(OS_CHROMEOS)
class ChromeMainTest : public InProcessBrowserTest { class ChromeMainTest : public InProcessBrowserTest {
public: public:
ChromeMainTest() {} ChromeMainTest() {}
...@@ -123,4 +127,6 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) { ...@@ -123,4 +127,6 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) {
ASSERT_EQ(1u, BrowserList::GetBrowserCountForType(profile, true)); ASSERT_EQ(1u, BrowserList::GetBrowserCountForType(profile, true));
} }
#endif // !OS_CHROMEOS
#endif // !OS_MACOSX #endif // !OS_MACOSX
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment