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

Unified Diff: chrome/test/nacl/nacl_browsertest.cc

Issue 12087042: Turn on NaClBrowserTest* under Linux ASAN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use env var instead Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/test/nacl/nacl_browsertest_util.h » ('j') | chrome/test/nacl/nacl_browsertest_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/nacl/nacl_browsertest.cc
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
index 06ae754baed8504666b3d2e89125a28717ba885b..baec81b7097681290f51880ee6578b642af12977 100644
--- a/chrome/test/nacl/nacl_browsertest.cc
+++ b/chrome/test/nacl/nacl_browsertest.cc
@@ -6,24 +6,11 @@
namespace {
-// These tests fail on Linux ASAN bots: <http://crbug.com/161709>.
-#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
-#define MAYBE_SimpleLoad DISABLED_SimpleLoad
-#define MAYBE_ExitStatus DISABLED_ExitStatus
-#define MAYBE_PPAPICore DISABLED_PPAPICore
-#define MAYBE_ProgressEvents DISABLED_ProgressEvents
-#else
-#define MAYBE_SimpleLoad SimpleLoad
-#define MAYBE_ExitStatus ExitStatus
-#define MAYBE_PPAPICore PPAPICore
-#define MAYBE_ProgressEvents ProgressEvents
-#endif
-
-NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_SimpleLoad, {
+NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, {
RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html"));
})
-NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ExitStatus, {
+NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus, {
RunNaClIntegrationTest(FILE_PATH_LITERAL(
"pm_exit_status_test.html?trigger=exit0&expected_exit=0"));
RunNaClIntegrationTest(FILE_PATH_LITERAL(
@@ -34,11 +21,11 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ExitStatus, {
"pm_exit_status_test.html?trigger=exitneg2&expected_exit=254"));
})
-NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPICore, {
+NACL_BROWSER_TEST_F(NaClBrowserTest, PPAPICore, {
RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_core.html"));
})
-NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ProgressEvents, {
+NACL_BROWSER_TEST_F(NaClBrowserTest, ProgressEvents, {
RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html"));
})
« no previous file with comments | « no previous file | chrome/test/nacl/nacl_browsertest_util.h » ('j') | chrome/test/nacl/nacl_browsertest_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698