chrome/test/nacl/nacl_browsertest_util.h - Issue 786273008: Non-SFI mode: Enable PnaclTransitional Non-SFI browser tests on x86-64 bots.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 786273008: Non-SFI mode: Enable PnaclTransitional Non-SFI browser tests on x86-64 bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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 8a922244a3e2b327adb355e81f9e3bd2e375cf51..156346c6368a79f092e583ebea0a46e5bef582a8 100644

--- a/chrome/test/nacl/nacl_browsertest_util.h

+++ b/chrome/test/nacl/nacl_browsertest_util.h

@@ -219,11 +219,11 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc {

# define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case

#endif

-// Similar to MAYBE_TRANSITIONAL_NONSFI, this is available only on x86-32 or

-// ARM.

-// TODO(hidehiko,mazda): Merge this to the MAYBE_PNACL_NONSFI when it is

-// supported on x86-64.

-#if defined(OS_LINUX) && (defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARMEL))

+// Similar to MAYBE_TRANSITIONAL_NONSFI, this is available only on x86-32,

+// x86-64 or ARM linux.

+#if defined(OS_LINUX) && \

+ (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64) || \

Mark Seaborn 2015/01/17 00:50:47 Nit: You could use "defined(ARCH_CPU_X86_FAMILY)"

hidehiko 2015/01/28 15:04:16 Done.

+ defined(ARCH_CPU_ARMEL))

# define MAYBE_PNACL_TRANSITIONAL_NONSFI(test_case) test_case

#else

# define MAYBE_PNACL_TRANSITIONAL_NONSFI(test_case) DISABLED_##test_case

« no previous file with comments | « chrome/test/data/nacl/nacl_test_data.gyp ('k') | ppapi/ppapi_nacl.gyp » ('j') | ppapi/ppapi_nacl.gyp » ('J')