| 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..368e4247633013271d9e9a2b7f34558335168ee6 100644
|
| --- a/chrome/test/nacl/nacl_browsertest.cc
|
| +++ b/chrome/test/nacl/nacl_browsertest.cc
|
| @@ -143,6 +143,9 @@ 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(NaClBrowserTestNewlib, IrtException) {
|
| + RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_exception_test.html"));
|
| +}
|
|
|
| NACL_BROWSER_TEST_F(NaClBrowserTest, Nameservice, {
|
| RunNaClIntegrationTest(FILE_PATH_LITERAL("pm_nameservice_test.html"));
|
| @@ -377,6 +380,20 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled, PnaclMimeType) {
|
| RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
|
| }
|
|
|
| +// The NonSFI test is currently available only on linux-x86-32
|
| +// architecture.
|
| +#if defined(OS_LINUX) && defined(ARCH_CPU_X86)
|
| +#define MAYBE_NONSFI(test_name) test_name
|
| +#else
|
| +#define MAYBE_NONSFI(test_name) DISABLED_##test_name
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclNonSfi,
|
| + MAYBE_NONSFI(IrtException)) {
|
| + RunNaClIntegrationTest(FILE_PATH_LITERAL(
|
| + "irt_exception_test.html"));
|
| +}
|
| +
|
| class NaClBrowserTestNewlibStdoutPM : public NaClBrowserTestNewlib {
|
| public:
|
| virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
|
|