diff options
author | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2009-06-17 21:45:24 +0000 |
---|---|---|
committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2009-06-17 21:45:24 +0000 |
commit | f621eda86586f17e0db413c1d4c3e9d74eb5a75a (patch) | |
tree | b59d233d41f00e4e9b398b3d3d37980f112d1dce | |
parent | 8e81d8957dc5893648d66642ad357f62d680ffda (diff) |
[Author: thomasvl]
Gets tests running under 10.5.7
R=stuartmorgan
DELTA=14 (8 added, 3 deleted, 3 changed)
-rw-r--r-- | Foundation/GTMNSAppleScript+HandlerTest.m | 2 | ||||
-rw-r--r-- | GTM.xcodeproj/project.pbxproj | 10 | ||||
-rw-r--r-- | UnitTesting/GTMNSObject+BindingUnitTesting.m | 4 | ||||
-rw-r--r-- | UnitTesting/TestData/GTMUnitTestingWindow.10.5.7.tiff | bin | 0 -> 21176 bytes |
4 files changed, 10 insertions, 6 deletions
diff --git a/Foundation/GTMNSAppleScript+HandlerTest.m b/Foundation/GTMNSAppleScript+HandlerTest.m index 44d0a0c..ee3fe1a 100644 --- a/Foundation/GTMNSAppleScript+HandlerTest.m +++ b/Foundation/GTMNSAppleScript+HandlerTest.m @@ -40,7 +40,7 @@ SInt32 major, minor, bugfix; [GTMSystemVersion getMajor:&major minor:&minor bugFix:&bugfix]; if (!(GTMIsGarbageCollectionEnabled() - && major <= 10 && minor <= 5 && bugfix <= 6)) { + && major <= 10 && minor <= 5 && bugfix <= 7)) { [super invokeTest]; } else { NSLog(@"--- %@ NOT run because of GC incompatibilites ---", [self name]); diff --git a/GTM.xcodeproj/project.pbxproj b/GTM.xcodeproj/project.pbxproj index 6fa45ba..3259624 100644 --- a/GTM.xcodeproj/project.pbxproj +++ b/GTM.xcodeproj/project.pbxproj @@ -275,6 +275,7 @@ F47F1D300D4914AD00925B8F /* GTMCalculatedRange.h in Headers */ = {isa = PBXBuildFile; fileRef = F47F1D2D0D4914AD00925B8F /* GTMCalculatedRange.h */; settings = {ATTRIBUTES = (Public, ); }; }; F47F1D310D4914AD00925B8F /* GTMCalculatedRange.m in Sources */ = {isa = PBXBuildFile; fileRef = F47F1D2E0D4914AD00925B8F /* GTMCalculatedRange.m */; }; F47F1D350D4914B600925B8F /* GTMCalculatedRangeTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F47F1D2F0D4914AD00925B8F /* GTMCalculatedRangeTest.m */; }; + F48D000D0FE994C900428D0B /* GTMUnitTestingWindow.10.5.7.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F48D000C0FE994BF00428D0B /* GTMUnitTestingWindow.10.5.7.tiff */; }; F49FA8440EEF2AB700077669 /* GTMFileSystemKQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = F49FA8420EEF2AB700077669 /* GTMFileSystemKQueue.h */; settings = {ATTRIBUTES = (Public, ); }; }; F49FA8450EEF2AB700077669 /* GTMFileSystemKQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = F49FA8430EEF2AB700077669 /* GTMFileSystemKQueue.m */; }; F49FA88B0EEF303D00077669 /* GTMFileSystemKQueueTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F49FA88A0EEF303D00077669 /* GTMFileSystemKQueueTest.m */; }; @@ -589,6 +590,7 @@ F47F1D2E0D4914AD00925B8F /* GTMCalculatedRange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMCalculatedRange.m; sourceTree = "<group>"; }; F47F1D2F0D4914AD00925B8F /* GTMCalculatedRangeTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMCalculatedRangeTest.m; sourceTree = "<group>"; }; F48B91040D94487D00D45044 /* libgcov_readme.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = libgcov_readme.html; sourceTree = "<group>"; }; + F48D000C0FE994BF00428D0B /* GTMUnitTestingWindow.10.5.7.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = GTMUnitTestingWindow.10.5.7.tiff; sourceTree = "<group>"; }; F48FE2410D197F9A009257D2 /* DebugTigerOrLater.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugTigerOrLater.xcconfig; sourceTree = "<group>"; }; F48FE2420D197F9A009257D2 /* DebugUnittest.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugUnittest.xcconfig; sourceTree = "<group>"; }; F48FE2430D197F9A009257D2 /* LoadableBundle.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = LoadableBundle.xcconfig; sourceTree = "<group>"; }; @@ -837,15 +839,16 @@ F435E46C0DC8F23A0069CDE8 /* TestData */ = { isa = PBXGroup; children = ( - 84B91B890EA3CC2E0087500F /* GTMUnitTestingImage.10.6.0.tiff */, - 84B91B8A0EA3CC2E0087500F /* GTMUnitTestingWindow.10.6.0.tiff */, - 8B2789950EF855FB00D68C01 /* GTMUnitTestingWindow.10.5.6.tiff */, 8B45A2DE0DA51A7E001148C5 /* GTMUnitTestingTest.nib */, 8B45A6B90DA67DD5001148C5 /* GTMUnitTestingImage.gtmUTState */, 8B45A5F50DA5EB9F001148C5 /* GTMUnitTestingWindow.gtmUTState */, 8B45A5F60DA5EB9F001148C5 /* GTMUnitTestingTestApp.gtmUTState */, 8BEEA90A0DA7446300894774 /* GTMUnitTestingImage.tiff */, + 84B91B890EA3CC2E0087500F /* GTMUnitTestingImage.10.6.0.tiff */, 8BEEA90B0DA7446300894774 /* GTMUnitTestingWindow.tiff */, + 8B2789950EF855FB00D68C01 /* GTMUnitTestingWindow.10.5.6.tiff */, + F48D000C0FE994BF00428D0B /* GTMUnitTestingWindow.10.5.7.tiff */, + 84B91B8A0EA3CC2E0087500F /* GTMUnitTestingWindow.10.6.0.tiff */, 8BEEA90C0DA7446300894774 /* GTMUnitTestingView.tiff */, ); path = TestData; @@ -1444,6 +1447,7 @@ 84B91B8B0EA3CC2E0087500F /* GTMUnitTestingImage.10.6.0.tiff in Resources */, 84B91B8C0EA3CC2E0087500F /* GTMUnitTestingWindow.10.6.0.tiff in Resources */, 8B2789960EF855FB00D68C01 /* GTMUnitTestingWindow.10.5.6.tiff in Resources */, + F48D000D0FE994C900428D0B /* GTMUnitTestingWindow.10.5.7.tiff in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/UnitTesting/GTMNSObject+BindingUnitTesting.m b/UnitTesting/GTMNSObject+BindingUnitTesting.m index d064a47..85c81ae 100644 --- a/UnitTesting/GTMNSObject+BindingUnitTesting.m +++ b/UnitTesting/GTMNSObject+BindingUnitTesting.m @@ -429,10 +429,10 @@ BOOL GTMDoExposedBindingsFunctionCorrectly(NSObject *object, NSMutableArray *array = [super gtm_unitTestExposedBindingsToIgnore]; SInt32 major, minor, bugFix; [GTMSystemVersion getMajor:&major minor:&minor bugFix:&bugFix]; - if (major <= 10 && minor <= 5 && bugFix <= 6) { + if (major <= 10 && minor <= 5 && bugFix <= 7) { // rdar://5851491 - Setting NSAlignmentBinding of search field to // NSCenterTextAlignment broken - // Broken on 10.5.6 and below. + // Broken on 10.5.7 and below. [array addObject:NSAlignmentBinding]; } // Not KVC Compliant diff --git a/UnitTesting/TestData/GTMUnitTestingWindow.10.5.7.tiff b/UnitTesting/TestData/GTMUnitTestingWindow.10.5.7.tiff Binary files differnew file mode 100644 index 0000000..9179576 --- /dev/null +++ b/UnitTesting/TestData/GTMUnitTestingWindow.10.5.7.tiff |