Skip to content
This repository was archived by the owner on Feb 2, 2023. It is now read-only.

Commit 7f1ac58

Browse files
committed
Merge pull request #1095 from aaronschubert0/Code-Coverage-Fix-Coverage
Check to see if Clang code coverage is interfering with GCC
2 parents 5a6d48b + 4817484 commit 7f1ac58

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

AsyncDisplayKit.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,6 +2021,7 @@
20212021
ALWAYS_SEARCH_USER_PATHS = NO;
20222022
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
20232023
CLANG_CXX_LIBRARY = "libc++";
2024+
CLANG_ENABLE_CODE_COVERAGE = NO;
20242025
CLANG_ENABLE_MODULES = YES;
20252026
CLANG_ENABLE_OBJC_ARC = YES;
20262027
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -2061,6 +2062,7 @@
20612062
ALWAYS_SEARCH_USER_PATHS = NO;
20622063
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
20632064
CLANG_CXX_LIBRARY = "libc++";
2065+
CLANG_ENABLE_CODE_COVERAGE = NO;
20642066
CLANG_ENABLE_MODULES = YES;
20652067
CLANG_ENABLE_OBJC_ARC = YES;
20662068
CLANG_WARN_BOOL_CONVERSION = YES;
@@ -2135,6 +2137,7 @@
21352137
baseConfigurationReference = FB07EABBCF28656C6297BC2D /* Pods-AsyncDisplayKitTests.debug.xcconfig */;
21362138
buildSettings = {
21372139
BUNDLE_LOADER = "$(TEST_HOST)";
2140+
CLANG_ENABLE_CODE_COVERAGE = YES;
21382141
FRAMEWORK_SEARCH_PATHS = (
21392142
"$(SDKROOT)/Developer/Library/Frameworks",
21402143
"$(inherited)",
@@ -2164,6 +2167,7 @@
21642167
baseConfigurationReference = D3779BCFF841AD3EB56537ED /* Pods-AsyncDisplayKitTests.release.xcconfig */;
21652168
buildSettings = {
21662169
BUNDLE_LOADER = "$(TEST_HOST)";
2170+
CLANG_ENABLE_CODE_COVERAGE = YES;
21672171
FRAMEWORK_SEARCH_PATHS = (
21682172
"$(SDKROOT)/Developer/Library/Frameworks",
21692173
"$(inherited)",
@@ -2190,6 +2194,7 @@
21902194
B35061EE1B010EDF0018CF92 /* Debug */ = {
21912195
isa = XCBuildConfiguration;
21922196
buildSettings = {
2197+
CLANG_ENABLE_CODE_COVERAGE = YES;
21932198
CLANG_WARN_UNREACHABLE_CODE = YES;
21942199
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
21952200
CURRENT_PROJECT_VERSION = 1;
@@ -2222,6 +2227,7 @@
22222227
B35061EF1B010EDF0018CF92 /* Release */ = {
22232228
isa = XCBuildConfiguration;
22242229
buildSettings = {
2230+
CLANG_ENABLE_CODE_COVERAGE = YES;
22252231
CLANG_WARN_UNREACHABLE_CODE = YES;
22262232
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
22272233
COPY_PHASE_STRIP = NO;

AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit-iOS.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
3031
<Testables>
3132
</Testables>
3233
<AdditionalOptions>

0 commit comments

Comments
 (0)