Commit 47e66f22 by Jamie Madill Committed by Commit Bot

Revert "Re-enable crash testing in angle_unittests."

This reverts commit 21add124. Reason for revert: Fails on Windows 7 x64 Chromium config. https://ci.chromium.org/p/chromium/builders/ci/Win%207%20Tests%20x64%20%281%29/73194 Original change's description: > Re-enable crash testing in angle_unittests. > > This is an experimental test to see if this works now. > Disabled on Win/ASAN because of conflicts with the > crash callback. > > Bug: angleproject:5239 > Change-Id: I280b18ab8846de79b561f26716df9ba374cfd9a5 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2496040 > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Commit-Queue: Jamie Madill <jmadill@chromium.org> TBR=ynovikov@chromium.org,jmadill@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: angleproject:5239 Change-Id: I83c150c2c2090b7d1aeb78e53e96115a167a7491 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2505479 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 46075937
...@@ -83,10 +83,7 @@ TEST_F(TestSuiteTest, RunMockTests) ...@@ -83,10 +83,7 @@ TEST_F(TestSuiteTest, RunMockTests)
{{"MockTestSuiteTest", "DISABLED_Pass"}, {TestResultType::Pass, 0.0}}, {{"MockTestSuiteTest", "DISABLED_Pass"}, {TestResultType::Pass, 0.0}},
{{"MockTestSuiteTest", "DISABLED_Fail"}, {TestResultType::Fail, 0.0}}, {{"MockTestSuiteTest", "DISABLED_Fail"}, {TestResultType::Fail, 0.0}},
{{"MockTestSuiteTest", "DISABLED_Timeout"}, {TestResultType::Timeout, 0.0}}, {{"MockTestSuiteTest", "DISABLED_Timeout"}, {TestResultType::Timeout, 0.0}},
// Issues with ASAN on Windows. http://anglebug.com/5238 // {{"MockTestSuiteTest", "DISABLED_Crash"}, {TestResultType::Crash, 0.0}},
#if !defined(ANGLE_PLATFORM_WINDOWS) || !defined(ANGLE_WITH_ASAN)
{{"MockTestSuiteTest", "DISABLED_Crash"}, {TestResultType::Crash, 0.0}},
#endif // !defined(ANGLE_PLATFORM_WINDOWS) || !defined(ANGLE_WITH_ASAN)
}; };
EXPECT_EQ(expectedResults, actual.results); EXPECT_EQ(expectedResults, actual.results);
...@@ -110,12 +107,9 @@ TEST(MockTestSuiteTest, DISABLED_Timeout) ...@@ -110,12 +107,9 @@ TEST(MockTestSuiteTest, DISABLED_Timeout)
angle::Sleep(20000); angle::Sleep(20000);
} }
// Issues with ASAN on Windows. http://anglebug.com/5238
#if !defined(ANGLE_PLATFORM_WINDOWS) || !defined(ANGLE_WITH_ASAN)
// Trigger a test crash. // Trigger a test crash.
TEST(MockTestSuiteTest, DISABLED_Crash) // TEST(MockTestSuiteTest, DISABLED_Crash)
{ // {
ANGLE_CRASH(); // ANGLE_CRASH();
} // }
#endif // !defined(ANGLE_PLATFORM_WINDOWS) || !defined(ANGLE_WITH_ASAN)
} // namespace } // namespace
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