diff options
| -rwxr-xr-x | Scripts/run-tests.sh | 18 | ||||
| -rw-r--r-- | sequel-pro.xcodeproj/project.pbxproj | 30 |
2 files changed, 41 insertions, 7 deletions
diff --git a/Scripts/run-tests.sh b/Scripts/run-tests.sh new file mode 100755 index 00000000..d1472f5e --- /dev/null +++ b/Scripts/run-tests.sh @@ -0,0 +1,18 @@ +#! /bin/ksh + +## $Id$ +## +## Author: Stuart Connolly (stuconnolly.com) +## Copyright (c) 2011 Stuart Connolly. All rights reserved. +## +## Paramters: <none> +## +## Description: Runs Sequel Pro's unit tests. This script should only be run by Xcode. + +# Add the unit test bundle's Frameworks/ path to the search paths for dynamic libraries +export DYLD_FRAMEWORK_PATH="${CONFIGURATION_BUILD_DIR}/${FULL_PRODUCT_NAME}/Contents/Frameworks" + +# Run the unit tests in this test bundle +"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests" + +exit 0 diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index a86d089f..6515cdf9 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -134,6 +134,7 @@ 17DD52C6115074CB007D8950 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 17DD52C4115074CB007D8950 /* Localizable.strings */; }; 17E090E811498FC9007FC1B4 /* SPPrintController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E090E711498FC9007FC1B4 /* SPPrintController.m */; }; 17E0937E114AE154007FC1B4 /* SPTableInfoPrintTemplate.html in Resources */ = {isa = PBXBuildFile; fileRef = 17E0937D114AE154007FC1B4 /* SPTableInfoPrintTemplate.html */; }; + 17E20E0012D660C3007F75A6 /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 11D44DEF118F5887002AA43C /* OCMock.framework */; }; 17E641460EF01EB5001BC333 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641440EF01EB5001BC333 /* main.m */; }; 17E641560EF01EF6001BC333 /* SPCustomQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641490EF01EF6001BC333 /* SPCustomQuery.m */; }; 17E641570EF01EF6001BC333 /* SPAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414B0EF01EF6001BC333 /* SPAppController.m */; }; @@ -509,6 +510,17 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + 17E20DEF12D6602F007F75A6 /* Copy Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 17E20E0012D660C3007F75A6 /* OCMock.framework in Copy Frameworks */, + ); + name = "Copy Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; 4DECC4940EC2B447008D359E /* Copy Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -768,6 +780,7 @@ 17E090E611498FC9007FC1B4 /* SPPrintController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPPrintController.h; sourceTree = "<group>"; }; 17E090E711498FC9007FC1B4 /* SPPrintController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPPrintController.m; sourceTree = "<group>"; }; 17E0937D114AE154007FC1B4 /* SPTableInfoPrintTemplate.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = SPTableInfoPrintTemplate.html; path = Templates/SPTableInfoPrintTemplate.html; sourceTree = "<group>"; }; + 17E20E1E12D6645F007F75A6 /* run-tests.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "run-tests.sh"; sourceTree = "<group>"; }; 17E641440EF01EB5001BC333 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 17E641450EF01EB5001BC333 /* Sequel-Pro.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Sequel-Pro.pch"; sourceTree = "<group>"; }; 17E641480EF01EF6001BC333 /* SPCustomQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPCustomQuery.h; sourceTree = "<group>"; }; @@ -1198,7 +1211,7 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 380F4ED60FC0B50500B0BFD7 /* Frameworks */ = { + 17E20DFF12D6609E007F75A6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -1286,12 +1299,13 @@ 584756B4120A06740057631F /* CoreServices.framework */, 584756B6120A067B0057631F /* ApplicationServices.framework */, 584756B8120A06830057631F /* QuickLook.framework */, + 58DC0D5E1293293400B76DA5 /* ShortcutRecorder.framework */, + 11D44DEF118F5887002AA43C /* OCMock.framework */, 296DC8BE0F9091DF002A3258 /* libicucore.dylib */, 179ECEC611F265EE009C6A40 /* libbz2.dylib */, 17B7B591101602AE00F057DE /* libssl.dylib */, 17B7B58F1016028F00F057DE /* libcrypto.dylib */, 583CE52C11725642008F148E /* libz.dylib */, - 58DC0D5E1293293400B76DA5 /* ShortcutRecorder.framework */, ); name = "Linked Frameworks"; sourceTree = "<group>"; @@ -1299,7 +1313,6 @@ 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */ = { isa = PBXGroup; children = ( - 11D44DEF118F5887002AA43C /* OCMock.framework */, 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */, 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */, B5EAC0FC0EC87FF900CC579C /* Security.framework */, @@ -1575,6 +1588,7 @@ children = ( 1713122F109C7DF600FB465F /* build.sh */, 1798AB0C12676CD9000D946A /* localize.sh */, + 17E20E1E12D6645F007F75A6 /* run-tests.sh */, 1761FD9D0EF0488900331368 /* build-version.pl */, 178934980F30CDA10097539A /* trim-application.sh */, 17B7B698101611C800F057DE /* build-mysql-client.sh */, @@ -2577,8 +2591,9 @@ isa = PBXNativeTarget; buildConfigurationList = 380F4EDE0FC0B50600B0BFD7 /* Build configuration list for PBXNativeTarget "Unit Tests" */; buildPhases = ( + 17E20DEF12D6602F007F75A6 /* Copy Frameworks */, 380F4ED50FC0B50500B0BFD7 /* Sources */, - 380F4ED60FC0B50500B0BFD7 /* Frameworks */, + 17E20DFF12D6609E007F75A6 /* Frameworks */, 380F4ED70FC0B50500B0BFD7 /* ShellScript */, ); buildRules = ( @@ -2933,7 +2948,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; + shellScript = "# Run build tasks\n\"${SRCROOT}/Scripts/run-tests.sh\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -3742,16 +3757,17 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; INFOPLIST_FILE = "Resources/Plists/Unit Tests-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; OTHER_LDFLAGS = ( "-framework", - Cocoa, + Foundation, "-framework", SenTestingKit, "-framework", MCPKit, + "-framework", + OCMock, ); PREBINDING = NO; PRODUCT_NAME = "Unit Tests"; |