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

Unified Diff: chrome/test/nacl/nacl_browsertest_util.h

Issue 249183004: Implement open_resource in non-SFI mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
Index: chrome/test/nacl/nacl_browsertest_util.h
diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h
index 417659322d6afd5e5873c5a228611137b3ab71bf..36be6c50eac5aea5a599c8714df9d1ac7e35d06b 100644
--- a/chrome/test/nacl/nacl_browsertest_util.h
+++ b/chrome/test/nacl/nacl_browsertest_util.h
@@ -142,6 +142,12 @@ class NaClBrowserTestNonSfiMode : public NaClBrowserTestBase {
virtual base::FilePath::StringType Variant() OVERRIDE;
};
+class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase {
+ public:
+ virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+ virtual base::FilePath::StringType Variant() OVERRIDE;
+};
+
// A NaCl browser test only using static files.
class NaClBrowserTestStatic : public NaClBrowserTestBase {
public:
@@ -158,6 +164,21 @@ class NaClBrowserTestStatic : public NaClBrowserTestBase {
#define MAYBE_PNACL(test_name) test_name
#endif
+// ASan does not work with libc-free context, so disable the test.
+#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER)
Mark Seaborn 2014/04/30 21:20:58 These are different from the conditions for MAYBE_
hidehiko 2014/05/01 05:20:31 Done.
+# define MAYBE_NONSFI(test_case) test_case
+#else
+# define MAYBE_NONSFI(test_case) DISABLED_##test_case
+#endif
+
+// Currently, translation from pexe to non-sfi nexe is supported only for
+// x86-32 binary.
+#if defined(OS_LINUX) && defined(ARCH_CPU_X86)
+# define MAYBE_PNACL_NONSFI(test_case) test_case
+#else
+# define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case
+#endif
+
#if defined(ARCH_CPU_ARM_FAMILY) || defined(ARCH_CPU_MIPS_FAMILY)
// There is no support for Glibc on ARM and MIPS NaCl.

Powered by Google App Engine
This is Rietveld 408576698