@@ -221,6 +221,7 @@ def msan(
221221 if isDebugBuildType :
222222 flags .append (CMakeOption (CMAKE .BUILD_TYPE , BuildType .DEBUG ))
223223 flags .append (CMakeOption (WITH .DBUG_TRACE , False ))
224+ flags .append (CMakeOption (PLUGIN .SPIDER_STORAGE_ENGINE , True )),
224225
225226 sequence .add_step (
226227 InContainer (
@@ -264,40 +265,46 @@ def msan(
264265 ]
265266
266267 ## ADD MTR TESTS
267- for step in (
268- get_mtr_normal_steps (
268+ steps = get_mtr_normal_steps (
269+ jobs = jobs ,
270+ env_vars = env_vars ,
271+ halt_on_failure = False ,
272+ path_to_test_runner = PurePath ("bld" , "mysql-test" ),
273+ additional_mtr_options = [MTROption (MTR .BIG_TEST , True )],
274+ step_wrapping_fn = lambda step : InContainer (docker_environment = config , step = step ),
275+ ) + get_mtr_s3_steps (
276+ jobs = jobs ,
277+ env_vars = env_vars ,
278+ halt_on_failure = False ,
279+ additional_mtr_options = [MTROption (MTR .BIG_TEST , True )],
280+ path_to_test_runner = PurePath ("bld" , "mysql-test" ),
281+ step_wrapping_fn = lambda step : InContainer (docker_environment = config , step = step ),
282+ )
283+ if isDebugBuildType :
284+ steps += get_mtr_spider_steps (
269285 jobs = jobs ,
270286 env_vars = env_vars ,
271287 halt_on_failure = False ,
272- path_to_test_runner = PurePath ("bld" , "mysql-test" ),
273288 additional_mtr_options = [MTROption (MTR .BIG_TEST , True )],
289+ path_to_test_runner = PurePath ("bld" , "mysql-test" ),
274290 step_wrapping_fn = lambda step : InContainer (
275291 docker_environment = config , step = step
276292 ),
277293 )
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" ),
294+ steps += [
295+ save_mtr_logs (
284296 step_wrapping_fn = lambda step : InContainer (
285297 docker_environment = config , step = step
286298 ),
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- ),
299+ ),
300+ mtr_junit_reporter (
301+ step_wrapping_fn = lambda step : InContainer (
302+ docker_environment = config , step = step
298303 ),
299- ]
300- ):
304+ ),
305+ ]
306+
307+ for step in steps :
301308 sequence .add_step (step )
302309
303310 return sequence
0 commit comments