| Index: chrome/test/ppapi/ppapi_browsertest.cc
|
| diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
|
| index 3cc27165da6bd865aa14eb537d1ebca846b06128..78e41dc419bc87d846d39bfbcacfd336ce8f2c68 100644
|
| --- a/chrome/test/ppapi/ppapi_browsertest.cc
|
| +++ b/chrome/test/ppapi/ppapi_browsertest.cc
|
| @@ -66,6 +66,7 @@ using content::RenderViewHost;
|
|
|
| #define MAYBE_PPAPI_NACL(test_name) DISABLED_##test_name
|
|
|
| +#define TEST_PPAPI_NACL_NATIVE(test_name)
|
| #define TEST_PPAPI_NACL(test_name)
|
| #define TEST_PPAPI_NACL_DISALLOWED_SOCKETS(test_name)
|
| #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name)
|
| @@ -75,11 +76,15 @@ using content::RenderViewHost;
|
|
|
| #define MAYBE_PPAPI_NACL(test_name) test_name
|
|
|
| -// NaCl based PPAPI tests
|
| -#define TEST_PPAPI_NACL(test_name) \
|
| +// NaCl based PPAPI tests (direct-to-native NaCl only, no PNaCl)
|
| +#define TEST_PPAPI_NACL_NATIVE(test_name) \
|
| IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
|
| RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
|
| - } \
|
| + }
|
| +
|
| +// NaCl based PPAPI tests
|
| +#define TEST_PPAPI_NACL(test_name) \
|
| + TEST_PPAPI_NACL_NATIVE(test_name) \
|
| IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, test_name) { \
|
| RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
|
| } \
|
| @@ -540,6 +545,10 @@ TEST_PPAPI_NACL(Var)
|
|
|
| TEST_PPAPI_NACL(VarResource)
|
|
|
| +#if defined(__i386__)
|
| +TEST_PPAPI_NACL_NATIVE(NaClIRTStackAlignment)
|
| +#endif
|
| +
|
| // PostMessage tests.
|
| #define RUN_POSTMESSAGE_SUBTESTS \
|
| RunTestViaHTTP( \
|
|
|