Author: dsanders Date: Sun May 22 09:18:22 2016 New Revision: 270362 URL: http://llvm.org/viewvc/llvm-project?rev=270362&view=rev Log: Merging r263199: ------------------------------------------------------------------------ r263199 | mohit.bhakkad | 2016-03-11 05:57:20 +0000 (Fri, 11 Mar 2016) | 7 lines
[Compiler-rt] Fix ioctl codes for MIPS in sanitizer_ioctl_test Reviewers: samsonov Subscribers: jaydeep, sagar, llvm-commits Differential Revision: http://reviews.llvm.org/D17985 ------------------------------------------------------------------------ Modified: compiler-rt/branches/release_38/lib/sanitizer_common/tests/sanitizer_ioctl_test.cc Modified: compiler-rt/branches/release_38/lib/sanitizer_common/tests/sanitizer_ioctl_test.cc URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/lib/sanitizer_common/tests/sanitizer_ioctl_test.cc?rev=270362&r1=270361&r2=270362&view=diff ============================================================================== --- compiler-rt/branches/release_38/lib/sanitizer_common/tests/sanitizer_ioctl_test.cc (original) +++ compiler-rt/branches/release_38/lib/sanitizer_common/tests/sanitizer_ioctl_test.cc Sun May 22 09:18:22 2016 @@ -78,7 +78,8 @@ TEST(SanitizerIoctl, Fixup) { // Test decoding KVM ioctl numbers. TEST(SanitizerIoctl, KVM_GET_MP_STATE) { ioctl_desc desc; - bool res = ioctl_decode(0x8004ae98U, &desc); + unsigned int desc_value = SANITIZER_MIPS ? 0x4004ae98U : 0x8004ae98U; + bool res = ioctl_decode(desc_value, &desc); EXPECT_TRUE(res); EXPECT_EQ(ioctl_desc::WRITE, desc.type); EXPECT_EQ(4U, desc.size); @@ -86,7 +87,8 @@ TEST(SanitizerIoctl, KVM_GET_MP_STATE) { TEST(SanitizerIoctl, KVM_GET_LAPIC) { ioctl_desc desc; - bool res = ioctl_decode(0x8400ae8eU, &desc); + unsigned int desc_value = SANITIZER_MIPS ? 0x4400ae8eU : 0x8400ae8eU; + bool res = ioctl_decode(desc_value, &desc); EXPECT_TRUE(res); EXPECT_EQ(ioctl_desc::WRITE, desc.type); EXPECT_EQ(1024U, desc.size); _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
