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

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

Issue 381883002: Non-SFI NaCl: Fix browser_tests based on libc_free.c (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment update Created 6 years, 5 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 | « chrome/test/data/nacl/nonsfi/libc_free.c ('k') | no next file » | no next file with comments »
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 695f967c4123b4c89d8d550ec6963af3cd997602..28debdded674fb32e562fe0877197fc486cbfc0a 100644
--- a/chrome/test/nacl/nacl_browsertest.cc
+++ b/chrome/test/nacl/nacl_browsertest.cc
@@ -33,24 +33,15 @@ namespace {
# define MAYBE_SysconfNprocessorsOnln SysconfNprocessorsOnln
#endif
-// crbug.com/392768
-#if defined(OS_LINUX)
-# define MAYBE_Messaging DISABLED_Messaging
-# define MAYBE_Irt DISABLED_Irt
-#else
-# define MAYBE_Messaging MAYBE_NONSFI(Messaging)
-# define MAYBE_Irt MAYBE_NONSFI(Irt)
-#endif
-
NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, {
RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html"));
})
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_Messaging) {
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Messaging)) {
RunLoadTest(FILE_PATH_LITERAL("libc_free.html"));
}
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_Irt) {
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Irt)) {
RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html"));
}
« no previous file with comments | « chrome/test/data/nacl/nonsfi/libc_free.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698