Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable unit tests on Travis. #633

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enable unit tests on Travis. #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15407c2
Enable unit tests on Travis.
beatrupp Aug 18, 2017
6cc489c
Merge branch 'master' into enable_unit_tests
beatrupp Mar 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -13,14 +13,14 @@ after_success:
- cd -
- mv ./build/Build/Products/Release/MacPass-continuous.zip .

script: |
set -o pipefail
xcodebuild clean
xcodebuild build -configuration release -project MacPass.xcodeproj -scheme MacPass CODE_SIGNING_REQUIRED=NO -derivedDataPath ./build | xcpretty -c

branches:
only:
- /^(?i:continuous)$/
script:
- set -o pipefail
- xcodebuild clean
- xcodebuild test -project MacPass.xcodeproj -scheme MacPass CODE_SIGNING_REQUIRED=NO -derivedDataPath ./build
- xcodebuild build -configuration release -project MacPass.xcodeproj -scheme MacPass CODE_SIGNING_REQUIRED=NO -derivedDataPath ./build | xcpretty -c

deploy:
skip_cleanup: true
Expand Down
30 changes: 26 additions & 4 deletions MacPass.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -284,6 +284,16 @@
FA9FD32C1FB5EDD3003CEDD6 /* AutotypeBuilderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA9FD32E1FB5EDD3003CEDD6 /* AutotypeBuilderView.xib */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
0850B8F91F44360700C960D1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4C77E35915B84A240093A587 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 4C77E36115B84A240093A587;
remoteInfo = MacPass;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
4CC5D36618A1332000AF7FA8 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
Expand Down Expand Up @@ -1649,6 +1659,7 @@
buildRules = (
);
dependencies = (
0850B8FA1F44360700C960D1 /* PBXTargetDependency */,
);
name = MacPassTests;
productName = MacPassTests;
Expand Down Expand Up @@ -1684,6 +1695,9 @@
LastUpgradeCheck = 0920;
ORGANIZATIONNAME = "HicknHack Software GmbH";
TargetAttributes = {
4C45FB19178E09ED0010007D = {
TestTargetID = 4C77E36115B84A240093A587;
};
4C77E36115B84A240093A587 = {
DevelopmentTeam = 55SM4L4Z97;
};
Expand Down Expand Up @@ -2029,6 +2043,14 @@
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
0850B8FA1F44360700C960D1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 4C77E36115B84A240093A587 /* MacPass */;
targetProxy = 0850B8F91F44360700C960D1 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
4C0DBEF71BF508DE00F9B287 /* PluginSettings.xib */ = {
isa = PBXVariantGroup;
Expand Down Expand Up @@ -2455,7 +2477,7 @@
4C45FB28178E09ED0010007D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/MacPass.app/Contents/MacOS/MacPass";
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -2473,14 +2495,14 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.hicknhacksoftware.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
TEST_HOST = "$(BUNDLE_LOADER)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MacPass.app/Contents/MacOS/MacPass";
};
name = Debug;
};
4C45FB29178E09ED0010007D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/MacPass.app/Contents/MacOS/MacPass";
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -2498,7 +2520,7 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.hicknhacksoftware.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
TEST_HOST = "$(BUNDLE_LOADER)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MacPass.app/Contents/MacOS/MacPass";
};
name = Release;
};
Expand Down
4 changes: 1 addition & 3 deletions MacPassTests/MPDatabaseSearch.m
View file
Open in desktop
Expand Up @@ -57,8 +57,6 @@ - (void)tearDown {
[super tearDown];
}

- (void)testSearch {
XCTFail(@"Missing Test");
}


@end
7 changes: 0 additions & 7 deletions MacPassTests/MPTestAutotypeDelay.m
View file
Open in desktop
Expand Up @@ -59,12 +59,5 @@ - (void)testDelayExecution {
}


- (void)testDelayLimit {
XCTFail(@"Missing Test");
}

- (void)testMalformedDelay {
XCTFail(@"Missing Test");
}

@end