@@ -214,7 +214,7 @@ def msan(
214
214
CMakeOption (WITH .ZLIB , "bundled" ),
215
215
CMakeOption (WITH .SYSTEMD , "no" ),
216
216
CMakeOption (PLUGIN .COLUMNSTORE_STORAGE_ENGINE , False ),
217
- CMakeOption (PLUGIN .SPIDER_STORAGE_ENGINE , False ),
217
+ CMakeOption (PLUGIN .SPIDER_STORAGE_ENGINE , isDebugBuildType ),
218
218
CMakeOption (PLUGIN .ROCKSDB_STORAGE_ENGINE , False ),
219
219
CMakeOption (PLUGIN .OQGRAPH_STORAGE_ENGINE , False ),
220
220
]
@@ -264,40 +264,46 @@ def msan(
264
264
]
265
265
266
266
## ADD MTR TESTS
267
- for step in (
268
- get_mtr_normal_steps (
267
+ steps = get_mtr_normal_steps (
268
+ jobs = jobs ,
269
+ env_vars = env_vars ,
270
+ halt_on_failure = False ,
271
+ path_to_test_runner = PurePath ("bld" , "mysql-test" ),
272
+ additional_mtr_options = [MTROption (MTR .BIG_TEST , True )],
273
+ step_wrapping_fn = lambda step : InContainer (docker_environment = config , step = step ),
274
+ ) + get_mtr_s3_steps (
275
+ jobs = jobs ,
276
+ env_vars = env_vars ,
277
+ halt_on_failure = False ,
278
+ additional_mtr_options = [MTROption (MTR .BIG_TEST , True )],
279
+ path_to_test_runner = PurePath ("bld" , "mysql-test" ),
280
+ step_wrapping_fn = lambda step : InContainer (docker_environment = config , step = step ),
281
+ )
282
+ if isDebugBuildType :
283
+ steps += get_mtr_spider_steps (
269
284
jobs = jobs ,
270
285
env_vars = env_vars ,
271
286
halt_on_failure = False ,
272
- path_to_test_runner = PurePath ("bld" , "mysql-test" ),
273
287
additional_mtr_options = [MTROption (MTR .BIG_TEST , True )],
288
+ path_to_test_runner = PurePath ("bld" , "mysql-test" ),
274
289
step_wrapping_fn = lambda step : InContainer (
275
290
docker_environment = config , step = step
276
291
),
277
292
)
278
- + get_mtr_s3_steps (
279
- jobs = jobs ,
280
- env_vars = env_vars ,
281
- halt_on_failure = False ,
282
- additional_mtr_options = [MTROption (MTR .BIG_TEST , True )],
283
- path_to_test_runner = PurePath ("bld" , "mysql-test" ),
293
+ steps += [
294
+ save_mtr_logs (
284
295
step_wrapping_fn = lambda step : InContainer (
285
296
docker_environment = config , step = step
286
297
),
287
- )
288
- + [
289
- save_mtr_logs (
290
- step_wrapping_fn = lambda step : InContainer (
291
- docker_environment = config , step = step
292
- ),
293
- ),
294
- mtr_junit_reporter (
295
- step_wrapping_fn = lambda step : InContainer (
296
- docker_environment = config , step = step
297
- ),
298
+ ),
299
+ mtr_junit_reporter (
300
+ step_wrapping_fn = lambda step : InContainer (
301
+ docker_environment = config , step = step
298
302
),
299
- ]
300
- ):
303
+ ),
304
+ ]
305
+
306
+ for step in steps :
301
307
sequence .add_step (step )
302
308
303
309
return sequence
0 commit comments