Skip to content

Commit 47c54d6

Browse files
committed
Made changes so that all tests pass on arm64.
1 parent 2b8ec5e commit 47c54d6

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

Source/OCMockTests/NSMethodSignatureOCMAdditionsTests.m

+7
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ @interface NSMethodSignatureOCMAdditionsTests : XCTestCase
3030

3131
@implementation NSMethodSignatureOCMAdditionsTests
3232

33+
#ifndef __arm64__
34+
35+
// Special structure return not really needed on arm64. And we should remove arm and i386 at some point...
36+
3337
- (void)testDeterminesThatSpecialReturnIsNotNeededForNonStruct
3438
{
3539
const char *types = "i";
@@ -98,6 +102,9 @@ - (void)testArchDependentSpecialReturns
98102
#endif
99103
}
100104

105+
#endif
106+
107+
101108
- (void)testNSMethodSignatureDebugDescriptionWorksTheWayWeExpectIt
102109
{
103110
const char *types = "{CATransform3D=ffffffffffffffff}";

Source/OCMockTests/OCMArgTests.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ - (void)testValueMacroCreatesCorrectValueObjects
3737
{
3838
NSRange range = NSMakeRange(5, 5);
3939
XCTAssertEqualObjects(OCMOCK_VALUE(range), [NSValue valueWithRange:range]);
40-
#if !(TARGET_OS_IPHONE && TARGET_RT_64_BIT)
41-
/* This should work everywhere but I can't get it to work on iOS 64-bit */
40+
#ifndef __arm64__
41+
// This should work everywhere but I can't get it to work on arm64
4242
XCTAssertEqualObjects(OCMOCK_VALUE((BOOL){YES}), @YES);
4343
#endif
4444
XCTAssertEqualObjects(OCMOCK_VALUE(42), @42);

0 commit comments

Comments
 (0)