Implement open_resource in non-SFI mode.

chrome/test/nacl/nacl_browsertest.cc

Index: chrome/test/nacl/nacl_browsertest.cc
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
index 9b6168c999257a3b8a4f0b8c6ec00d09dd9f337d..d8d5f4228f2107eebd83cf9ab74e5e41e1fb35e6 100644
--- a/chrome/test/nacl/nacl_browsertest.cc
+++ b/chrome/test/nacl/nacl_browsertest.cc
@@ -37,25 +37,11 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, {
   RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html"));
 })
 

[Mark Seaborn, 2014/04/30 21:20:58]

If you rebase, you'll find there's now a definition of MAYBE_NONSFI in this file
(from Junichi's irt_exception change).  Please remove that, since you're adding
a definition to nacl_browsertest_util.h.

Also, you'll need to resolve the difference between MAYBE_NONSFI and
MAYBE_PNACL_NONSFI.

[hidehiko, 2014/05/01 05:20:31]

Done.

-// ASan does not work with libc-free context, so disable the test.
-#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER)
-#  define MAYBE_NonSfiMessaging NonSfiMessaging
-#else
-#  define MAYBE_NonSfiMessaging DISABLED_NonSfiMessaging
-#endif
-
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NonSfiMessaging) {
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Messaging)) {
   RunLoadTest(FILE_PATH_LITERAL("libc_free.html"));
 }
 
-// ASan does not work with libc-free context, so disable the test.
-#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER)
-#  define MAYBE_NonSfiIrt NonSfiIrt
-#else
-#  define MAYBE_NonSfiIrt DISABLED_NonSfiIrt
-#endif
-
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NonSfiIrt) {
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Irt)) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html"));
 }
 
@@ -143,6 +129,10 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, PreInitManifestFile) {
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlib, IrtManifestFile) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));
 }
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
+                       MAYBE_PNACL_NONSFI(IrtManifestFile)) {
+  RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_manifest_file_test.html"));

[Mark Seaborn, 2014/04/30 21:20:58]

I had a look at this test
(chrome/test/data/nacl/manifest_file/irt_manifest_file_test.cc).  Its coverage
is a bit limited -- it doesn't test the error code path (i.e. when
open_resource() returns ENOENT).

Also, it doesn't check what happens if a file is present in the manifest, but
fetching the URL gives an error (such as 404).  Should that return something
like EIO instead of ENOENT?  What's the current behaviour with SFI NaCl?

Can you extend it to test for that, in a separate change, please?

[hidehiko, 2014/05/01 05:20:31]

Ok, I'll work on in a following CL.

+}
 
 NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, {
   RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html"));