From 2701e1a82f7350f9afdb987755d50cbcab675c8b Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Wed, 12 Mar 2025 17:44:47 +0100 Subject: [PATCH 1/4] tests: change test coverage targets to Sentry and SentrySwiftUI --- Plans/SentryTests_Base.xctestplan | 15 ++++++++++++++- Plans/Sentry_Base.xctestplan | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/Plans/SentryTests_Base.xctestplan b/Plans/SentryTests_Base.xctestplan index 5edbbd0c8bd..f01304b02bf 100644 --- a/Plans/SentryTests_Base.xctestplan +++ b/Plans/SentryTests_Base.xctestplan @@ -9,7 +9,20 @@ } ], "defaultOptions" : { - "codeCoverage" : false, + "codeCoverage" : { + "targets" : [ + { + "containerPath" : "container:Sentry.xcodeproj", + "identifier" : "63AA759A1EB8AEF500D153DE", + "name" : "Sentry" + }, + { + "containerPath" : "container:Sentry.xcodeproj", + "identifier" : "D8199DA929376E9B0074249E", + "name" : "SentrySwiftUI" + } + ] + }, "uiTestingScreenshotsLifetime" : "keepAlways" }, "testTargets" : [ diff --git a/Plans/Sentry_Base.xctestplan b/Plans/Sentry_Base.xctestplan index 37131ed39e8..533634414e3 100644 --- a/Plans/Sentry_Base.xctestplan +++ b/Plans/Sentry_Base.xctestplan @@ -9,6 +9,20 @@ } ], "defaultOptions" : { + "codeCoverage" : { + "targets" : [ + { + "containerPath" : "container:Sentry.xcodeproj", + "identifier" : "63AA759A1EB8AEF500D153DE", + "name" : "Sentry" + }, + { + "containerPath" : "container:Sentry.xcodeproj", + "identifier" : "D8199DA929376E9B0074249E", + "name" : "SentrySwiftUI" + } + ] + }, "environmentVariableEntries" : [ { "key" : "TSAN_OPTIONS", From d1a80404496a34c6066d4109b25e0cdf8379c733 Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Thu, 13 Mar 2025 09:27:26 +0100 Subject: [PATCH 2/4] more coverage config --- Plans/SentrySwiftUI_Base.xctestplan | 14 ++++++++++++++ Plans/SwiftUITestSample_Base.xctestplan | 1 + Plans/iOS-ObjectiveC_Base.xctestplan | 1 + Plans/iOS-Swift6_Base.xctestplan | 1 + Plans/iOS-Swift_Base.xctestplan | 1 + Plans/iOS15-SwiftUI.xctestplan | 1 + Plans/macOS-SwiftUI_Base.xctestplan | 1 + Plans/visionOS-Swift_Base.xctestplan | 1 + 8 files changed, 21 insertions(+) diff --git a/Plans/SentrySwiftUI_Base.xctestplan b/Plans/SentrySwiftUI_Base.xctestplan index 4d7a180d7cf..b3f18022643 100644 --- a/Plans/SentrySwiftUI_Base.xctestplan +++ b/Plans/SentrySwiftUI_Base.xctestplan @@ -9,6 +9,20 @@ } ], "defaultOptions" : { + "codeCoverage" : { + "targets" : [ + { + "containerPath" : "container:Sentry.xcodeproj", + "identifier" : "D8199DA929376E9B0074249E", + "name" : "SentrySwiftUI" + }, + { + "containerPath" : "container:Sentry.xcodeproj", + "identifier" : "63AA759A1EB8AEF500D153DE", + "name" : "Sentry" + } + ] + }, "uiTestingScreenshotsLifetime" : "keepAlways" }, "testTargets" : [ diff --git a/Plans/SwiftUITestSample_Base.xctestplan b/Plans/SwiftUITestSample_Base.xctestplan index 33cb41633c5..ca8831db84b 100644 --- a/Plans/SwiftUITestSample_Base.xctestplan +++ b/Plans/SwiftUITestSample_Base.xctestplan @@ -9,6 +9,7 @@ } ], "defaultOptions" : { + "codeCoverage" : false, "uiTestingScreenshotsLifetime" : "keepAlways" }, "testTargets" : [ diff --git a/Plans/iOS-ObjectiveC_Base.xctestplan b/Plans/iOS-ObjectiveC_Base.xctestplan index aa08a7508ac..5a8d097399e 100644 --- a/Plans/iOS-ObjectiveC_Base.xctestplan +++ b/Plans/iOS-ObjectiveC_Base.xctestplan @@ -9,6 +9,7 @@ } ], "defaultOptions" : { + "codeCoverage" : false, "uiTestingScreenshotsLifetime" : "keepAlways" }, "testTargets" : [ diff --git a/Plans/iOS-Swift6_Base.xctestplan b/Plans/iOS-Swift6_Base.xctestplan index b3ed0de6e7e..99da4148c35 100644 --- a/Plans/iOS-Swift6_Base.xctestplan +++ b/Plans/iOS-Swift6_Base.xctestplan @@ -9,6 +9,7 @@ } ], "defaultOptions" : { + "codeCoverage" : false, "uiTestingScreenshotsLifetime" : "keepAlways" }, "testTargets" : [ diff --git a/Plans/iOS-Swift_Base.xctestplan b/Plans/iOS-Swift_Base.xctestplan index 09c1c52347b..a4ead3042a3 100644 --- a/Plans/iOS-Swift_Base.xctestplan +++ b/Plans/iOS-Swift_Base.xctestplan @@ -9,6 +9,7 @@ } ], "defaultOptions" : { + "codeCoverage" : false, "commandLineArgumentEntries" : [ { "argument" : "--io.sentry.disable-everything", diff --git a/Plans/iOS15-SwiftUI.xctestplan b/Plans/iOS15-SwiftUI.xctestplan index 314f4104d00..4bb3bf1610d 100644 --- a/Plans/iOS15-SwiftUI.xctestplan +++ b/Plans/iOS15-SwiftUI.xctestplan @@ -9,6 +9,7 @@ } ], "defaultOptions" : { + "codeCoverage" : false, "uiTestingScreenshotsLifetime" : "keepAlways" }, "testTargets" : [ diff --git a/Plans/macOS-SwiftUI_Base.xctestplan b/Plans/macOS-SwiftUI_Base.xctestplan index 0125f11968a..9300a16636f 100644 --- a/Plans/macOS-SwiftUI_Base.xctestplan +++ b/Plans/macOS-SwiftUI_Base.xctestplan @@ -9,6 +9,7 @@ } ], "defaultOptions" : { + "codeCoverage" : false, "uiTestingScreenshotsLifetime" : "keepAlways" }, "testTargets" : [ diff --git a/Plans/visionOS-Swift_Base.xctestplan b/Plans/visionOS-Swift_Base.xctestplan index 85b473b7523..6f0dcdf7dd1 100644 --- a/Plans/visionOS-Swift_Base.xctestplan +++ b/Plans/visionOS-Swift_Base.xctestplan @@ -9,6 +9,7 @@ } ], "defaultOptions" : { + "codeCoverage" : false, "uiTestingScreenshotsLifetime" : "keepAlways" }, "testTargets" : [ From 313a275beab998c2fb1189b3d858fcf66eaa3fd0 Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Thu, 13 Mar 2025 16:56:31 +0100 Subject: [PATCH 3/4] ignore test files in slather --- .slather.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.slather.yml b/.slather.yml index 322b84775fd..4ea5a0746f1 100644 --- a/.slather.yml +++ b/.slather.yml @@ -6,3 +6,6 @@ workspace: Sentry.xcworkspace scheme: Sentry source_directory: Sources output_directory: slather +ignore: + - 'Tests/**' + - 'SentryTestUtils/**' From aa66c1d589efabfcaab167944b73500eafb65a03 Mon Sep 17 00:00:00 2001 From: Philip Niedertscheider Date: Fri, 14 Mar 2025 13:57:23 +0100 Subject: [PATCH 4/4] Update .slather.yml --- .slather.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.slather.yml b/.slather.yml index 4ea5a0746f1..b6679da276d 100644 --- a/.slather.yml +++ b/.slather.yml @@ -7,5 +7,5 @@ scheme: Sentry source_directory: Sources output_directory: slather ignore: - - 'Tests/**' - - 'SentryTestUtils/**' + - '**/Tests/**' + - '**/SentryTestUtils/**'