Skip to content

Commit 1c7b618

Browse files
grouegroue
committed
Parallelizable tests
1 parent d3ad7ac commit 1c7b618

File tree

8 files changed

+34
-46
lines changed

8 files changed

+34
-46
lines changed

‎Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo.xcodeproj/xcshareddata/xcschemes/GRDBAsyncDemo.xcscheme‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
32-
skipped = "NO">
32+
skipped = "NO"
33+
parallelizable = "YES">
3334
<BuildableReference
3435
BuildableIdentifier = "primary"
3536
BlueprintIdentifier = "56026C9725B8A7D000D1DF3F"

‎Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo.xcodeproj/xcshareddata/xcschemes/GRDBCombineDemo.xcscheme‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
32-
skipped = "NO">
32+
skipped = "NO"
33+
parallelizable = "YES">
3334
<BuildableReference
3435
BuildableIdentifier = "primary"
3536
BlueprintIdentifier = "56026C9725B8A7D000D1DF3F"

‎Documentation/DemoApps/GRDBDemoiOS/GRDBDemoiOS.xcodeproj/xcshareddata/xcschemes/GRDBDemoiOS.xcscheme‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
32-
skipped = "NO">
32+
skipped = "NO"
33+
parallelizable = "YES">
3334
<BuildableReference
3435
BuildableIdentifier = "primary"
3536
BlueprintIdentifier = "56185BEF25B80B8900B9C30F"

‎GRDB.xcodeproj/xcshareddata/xcschemes/GRDB.xcscheme‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
codeCoverageEnabled = "YES">
4545
<Testables>
4646
<TestableReference
47-
skipped = "NO">
47+
skipped = "NO"
48+
parallelizable = "YES">
4849
<BuildableReference
4950
BuildableIdentifier = "primary"
5051
BlueprintIdentifier = "56E5D7F81B4D422D00430942"

‎GRDBCustom.xcodeproj/xcshareddata/xcschemes/GRDBCustom.xcscheme‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
codeCoverageEnabled = "YES">
4545
<Testables>
4646
<TestableReference
47-
skipped = "NO">
47+
skipped = "NO"
48+
parallelizable = "YES">
4849
<BuildableReference
4950
BuildableIdentifier = "primary"
5051
BlueprintIdentifier = "F3BA809A1CFB2F6F003DC1BA"

‎Makefile‎

Lines changed: 20 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ test_framework_GRDBOSX_maxSwift:
114114
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
115115
OTHER_SWIFT_FLAGS=$(OTHER_SWIFT_FLAGS) \
116116
GCC_PREPROCESSOR_DEFINITIONS=$(GCC_PREPROCESSOR_DEFINITIONS) \
117-
$(TEST_ACTIONS) \
118-
$(XCPRETTY)
117+
$(TEST_ACTIONS)
119118

120119
test_framework_GRDBOSX_minSwift:
121120
ifdef MIN_SWIFT_VERSION
@@ -125,8 +124,7 @@ ifdef MIN_SWIFT_VERSION
125124
SWIFT_VERSION=$(MIN_SWIFT_VERSION) \
126125
OTHER_SWIFT_FLAGS=$(OTHER_SWIFT_FLAGS) \
127126
GCC_PREPROCESSOR_DEFINITIONS=$(GCC_PREPROCESSOR_DEFINITIONS) \
128-
$(TEST_ACTIONS) \
129-
$(XCPRETTY)
127+
$(TEST_ACTIONS)
130128
endif
131129

132130
test_framework_GRDBWatchOS:
@@ -149,8 +147,7 @@ test_framework_GRDBiOS_maxTarget_maxSwift:
149147
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
150148
OTHER_SWIFT_FLAGS=$(OTHER_SWIFT_FLAGS) \
151149
GCC_PREPROCESSOR_DEFINITIONS=$(GCC_PREPROCESSOR_DEFINITIONS) \
152-
$(TEST_ACTIONS) \
153-
$(XCPRETTY)
150+
$(TEST_ACTIONS)
154151

155152
test_framework_GRDBiOS_maxTarget_minSwift:
156153
ifdef MIN_SWIFT_VERSION
@@ -161,8 +158,7 @@ ifdef MIN_SWIFT_VERSION
161158
SWIFT_VERSION=$(MIN_SWIFT_VERSION) \
162159
OTHER_SWIFT_FLAGS=$(OTHER_SWIFT_FLAGS) \
163160
GCC_PREPROCESSOR_DEFINITIONS=$(GCC_PREPROCESSOR_DEFINITIONS) \
164-
$(TEST_ACTIONS) \
165-
$(XCPRETTY)
161+
$(TEST_ACTIONS)
166162
endif
167163

168164
test_framework_GRDBiOS_minTarget:
@@ -171,8 +167,7 @@ test_framework_GRDBiOS_minTarget:
171167
-scheme GRDB \
172168
-destination $(MIN_IOS_DESTINATION) \
173169
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
174-
$(TEST_ACTIONS) \
175-
$(XCPRETTY)
170+
$(TEST_ACTIONS)
176171

177172
test_framework_GRDBtvOS: test_framework_GRDBtvOS_maxTarget test_framework_GRDBtvOS_minTarget
178173
test_framework_GRDBtvOS_maxTarget: test_framework_GRDBtvOS_maxTarget_maxSwift test_framework_GRDBtvOS_maxTarget_minSwift
@@ -185,8 +180,7 @@ test_framework_GRDBtvOS_maxTarget_maxSwift:
185180
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
186181
OTHER_SWIFT_FLAGS=$(OTHER_SWIFT_FLAGS) \
187182
GCC_PREPROCESSOR_DEFINITIONS=$(GCC_PREPROCESSOR_DEFINITIONS) \
188-
$(TEST_ACTIONS) \
189-
$(XCPRETTY)
183+
$(TEST_ACTIONS)
190184

191185
test_framework_GRDBtvOS_maxTarget_minSwift:
192186
ifdef MIN_SWIFT_VERSION
@@ -197,8 +191,7 @@ ifdef MIN_SWIFT_VERSION
197191
SWIFT_VERSION=$(MIN_SWIFT_VERSION) \
198192
OTHER_SWIFT_FLAGS=$(OTHER_SWIFT_FLAGS) \
199193
GCC_PREPROCESSOR_DEFINITIONS=$(GCC_PREPROCESSOR_DEFINITIONS) \
200-
$(TEST_ACTIONS) \
201-
$(XCPRETTY)
194+
$(TEST_ACTIONS)
202195
endif
203196

204197
test_framework_GRDBtvOS_minTarget:
@@ -208,17 +201,15 @@ ifdef MIN_TVOS_DESTINATION
208201
-scheme GRDB \
209202
-destination $(MIN_TVOS_DESTINATION) \
210203
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
211-
$(TEST_ACTIONS) \
212-
$(XCPRETTY)
204+
$(TEST_ACTIONS)
213205
endif
214206

215207
test_framework_GRDBCustomSQLiteOSX: SQLiteCustom
216208
$(XCODEBUILD) \
217209
-project GRDBCustom.xcodeproj \
218210
-scheme GRDBCustom \
219211
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
220-
$(TEST_ACTIONS) \
221-
$(XCPRETTY)
212+
$(TEST_ACTIONS)
222213

223214
test_framework_GRDBCustomSQLiteiOS: test_framework_GRDBCustomSQLiteiOS_maxTarget test_framework_GRDBCustomSQLiteiOS_minTarget
224215
test_framework_GRDBCustomSQLiteiOS_maxTarget: test_framework_GRDBCustomSQLiteiOS_maxTarget_maxSwift test_framework_GRDBCustomSQLiteiOS_maxTarget_minSwift
@@ -229,8 +220,7 @@ test_framework_GRDBCustomSQLiteiOS_maxTarget_maxSwift: SQLiteCustom
229220
-scheme GRDBCustom \
230221
-destination $(MAX_IOS_DESTINATION) \
231222
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
232-
$(TEST_ACTIONS) \
233-
$(XCPRETTY)
223+
$(TEST_ACTIONS)
234224

235225
test_framework_GRDBCustomSQLiteiOS_maxTarget_minSwift: SQLiteCustom
236226
ifdef MIN_SWIFT_VERSION
@@ -239,8 +229,7 @@ ifdef MIN_SWIFT_VERSION
239229
-scheme GRDBCustom \
240230
-destination $(MAX_IOS_DESTINATION) \
241231
SWIFT_VERSION=$(MIN_SWIFT_VERSION) \
242-
$(TEST_ACTIONS) \
243-
$(XCPRETTY)
232+
$(TEST_ACTIONS)
244233
endif
245234

246235
test_framework_GRDBCustomSQLiteiOS_minTarget: SQLiteCustom
@@ -249,8 +238,7 @@ test_framework_GRDBCustomSQLiteiOS_minTarget: SQLiteCustom
249238
-scheme GRDBCustom \
250239
-destination $(MIN_IOS_DESTINATION) \
251240
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
252-
$(TEST_ACTIONS) \
253-
$(XCPRETTY)
241+
$(TEST_ACTIONS)
254242

255243
test_framework_SQLCipher3:
256244
ifdef POD
@@ -260,8 +248,7 @@ ifdef POD
260248
-workspace GRDBTests.xcworkspace \
261249
-scheme GRDBTests \
262250
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
263-
build-for-testing test-without-building \
264-
$(XCPRETTY)
251+
build-for-testing test-without-building
265252
else
266253
@echo CocoaPods must be installed for test_framework_SQLCipher3
267254
@exit 1
@@ -275,8 +262,7 @@ ifdef POD
275262
-workspace GRDBTests.xcworkspace \
276263
-scheme GRDBEncryptedTests \
277264
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
278-
build-for-testing test-without-building \
279-
$(XCPRETTY)
265+
build-for-testing test-without-building
280266
else
281267
@echo CocoaPods must be installed for test_framework_SQLCipher3Encrypted
282268
@exit 1
@@ -290,8 +276,7 @@ ifdef POD
290276
-workspace GRDBTests.xcworkspace \
291277
-scheme GRDBTests \
292278
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
293-
build-for-testing test-without-building \
294-
$(XCPRETTY)
279+
build-for-testing test-without-building
295280
else
296281
@echo CocoaPods must be installed for test_framework_SQLCipher4
297282
@exit 1
@@ -305,8 +290,7 @@ ifdef POD
305290
-workspace GRDBTests.xcworkspace \
306291
-scheme GRDBEncryptedTests \
307292
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
308-
build-for-testing test-without-building \
309-
$(XCPRETTY)
293+
build-for-testing test-without-building
310294
else
311295
@echo CocoaPods must be installed for test_framework_SQLCipher4Encrypted
312296
@exit 1
@@ -317,7 +301,7 @@ test_SPM:
317301
$(SWIFT) package clean
318302
$(SWIFT) build
319303
$(SWIFT) build -c release
320-
set -o pipefail && $(SWIFT) test $(XCPRETTY)
304+
set -o pipefail && $(SWIFT) test --parallel
321305

322306
test_archive_GRDBOSX_xcframework:
323307
rm -rf Tests/products
@@ -443,26 +427,23 @@ test_GRDBDemoiOS:
443427
-scheme GRDBDemoiOS \
444428
-destination $(MAX_IOS_DESTINATION) \
445429
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
446-
$(TEST_ACTIONS) \
447-
$(XCPRETTY)
430+
$(TEST_ACTIONS)
448431

449432
test_GRDBCombineDemo:
450433
$(XCODEBUILD) \
451434
-project Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo.xcodeproj \
452435
-scheme GRDBCombineDemo \
453436
-destination $(MAX_IOS_DESTINATION) \
454437
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
455-
$(TEST_ACTIONS) \
456-
$(XCPRETTY)
438+
$(TEST_ACTIONS)
457439

458440
test_GRDBAsyncDemo:
459441
$(XCODEBUILD) \
460442
-project Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo.xcodeproj \
461443
-scheme GRDBAsyncDemo \
462444
-destination $(MAX_IOS_DESTINATION) \
463445
SWIFT_VERSION=$(MAX_SWIFT_VERSION) \
464-
$(TEST_ACTIONS) \
465-
$(XCPRETTY)
446+
$(TEST_ACTIONS)
466447

467448
test_performance:
468449
$(XCODEBUILD) \

‎Tests/CocoaPods/SQLCipher3/GRDBTests.xcodeproj/xcshareddata/xcschemes/GRDBTests.xcscheme‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
</MacroExpansion>
3939
<Testables>
4040
<TestableReference
41-
skipped = "NO">
41+
skipped = "NO"
42+
parallelizable = "YES">
4243
<BuildableReference
4344
BuildableIdentifier = "primary"
4445
BlueprintIdentifier = "564A1F1C226B876D001F64F1"

‎Tests/CocoaPods/SQLCipher4/GRDBTests.xcodeproj/xcshareddata/xcschemes/GRDBTests.xcscheme‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
</MacroExpansion>
3939
<Testables>
4040
<TestableReference
41-
skipped = "NO">
41+
skipped = "NO"
42+
parallelizable = "YES">
4243
<BuildableReference
4344
BuildableIdentifier = "primary"
4445
BlueprintIdentifier = "564A1F1C226B876D001F64F1"

0 commit comments

Comments
 (0)