Implement open_resource in non-SFI mode.

chrome/test/nacl/nacl_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 #if defined(OS_POSIX)
 #include <unistd.h>
 #elif defined(OS_WIN)
 #include <windows.h>
 #endif
@@ skipping 18 matching lines @@
 #if defined(OS_WIN)
 // crbug.com/98721
 #  define MAYBE_SysconfNprocessorsOnln DISABLED_SysconfNprocessorsOnln
 #else
 #  define MAYBE_SysconfNprocessorsOnln SysconfNprocessorsOnln
 #endif
 
 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"));
 }
 
 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus0, {
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
       "pm_exit_status_test.html?trigger=exit0&expected_exit=0"));
 })
 
 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus254, {
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
@@ skipping 67 matching lines @@
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
       "pm_pre_init_manifest_file_test.html"));
 }
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestGLibc, PreInitManifestFile) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
       "pm_pre_init_manifest_file_test.html"));
 }
 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"));
 })
 
 // Some versions of Visual Studio does not like preprocessor
 // conditionals inside the argument of a macro, so we put the
 // conditionals on a helper function.  We are already in an anonymous
 // namespace, so the name of the helper is not visible in external
 // scope.
@@ skipping 299 matching lines @@
   }
 };
 
 // TODO(ncbray) support glibc and PNaCl
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MimeHandler) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
       "ppapi_extension_mime_handler.html"));
 }
 
 }  // namespace