diff options
| author | Elliott Hughes <enh@google.com> | 2015-12-14 15:59:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-14 15:59:29 +0000 |
| commit | 162a8524ea79564b5c92e5effc86588cac07e23c (patch) | |
| tree | 586407a00f3baea0689ddac7ac4b428ef7d4ddd0 | |
| parent | a7ff3964abc860f70f242a1d2ee3f6e3e690d4df (diff) | |
| parent | 61cf963efeb8066172ad7529b8036ba9dd392d0e (diff) | |
Merge "Fix personality test for mips32r6"
| -rw-r--r-- | tests/sys_personality_test.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/sys_personality_test.cpp b/tests/sys_personality_test.cpp index 2dfaa658c..6bd00efd9 100644 --- a/tests/sys_personality_test.cpp +++ b/tests/sys_personality_test.cpp @@ -21,7 +21,9 @@ TEST(sys_personality, current_persona) { int persona = personality(0xffffffff) & PER_MASK; #if defined(__BIONIC__) -#if defined(__LP64__) +// When personality syscall is executed on mips64, for a 32bit process +// sys_32_personality() is called, which converts PER_LINUX32 -> PER_LINUX +#if defined(__LP64__) || (__mips==32 && __mips_isa_rev>2) ASSERT_EQ(PER_LINUX, persona); #else ASSERT_EQ(PER_LINUX32, persona); |