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

Unified Diff: base/cancellation_flag_unittest.cc

Issue 482001: Force failing CHECK/DCHECKs to end the process on Windows.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/test/test_suite.h » ('j') | base/test/test_suite.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/cancellation_flag_unittest.cc
===================================================================
--- base/cancellation_flag_unittest.cc (revision 34168)
+++ base/cancellation_flag_unittest.cc (working copy)
@@ -49,18 +49,10 @@
ASSERT_TRUE(flag.IsSet());
}
-#if defined(OS_WIN)
-#define DISABLED_ON_WIN(x) DISABLED_##x
-#else
-#define DISABLED_ON_WIN(x) x
-#endif
-
-// CancellationFlag should die on a DCHECK if Set() is called from
-// other thread.
-// This test isn't Windows-friendly yet since ASSERT_DEATH doesn't catch tests
-// failed on DCHECK. See http://crbug.com/24885 for the details.
-TEST(CancellationFlagTest, DISABLED_ON_WIN(SetOnDifferentThreadDeathTest)) {
+TEST(CancellationFlagTest, SetOnDifferentThreadDeathTest) {
// Checks that Set() can't be called from any other thread.
+ // CancellationFlag should die on a DCHECK if Set() is called from
+ // other thread.
::testing::FLAGS_gtest_death_test_style = "threadsafe";
Thread t("CancellationFlagTest.SetOnDifferentThreadDeathTest");
ASSERT_TRUE(t.Start());
« no previous file with comments | « no previous file | base/test/test_suite.h » ('j') | base/test/test_suite.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698