|
49 | 49 | from absl import logging
|
50 | 50 | from print_matrix_configuration import PARAMETERS
|
51 | 51 | from print_matrix_configuration import BUILD_CONFIGS
|
| 52 | +from print_matrix_configuration import TEST_DEVICES |
52 | 53 |
|
53 | 54 | import glob
|
54 | 55 | import re
|
@@ -355,26 +356,29 @@ def combine_config(config, platform, k):
|
355 | 356 | # config_name = test_device here
|
356 | 357 | k = -1
|
357 | 358 | config_name = BUILD_CONFIGS[platform][k]
|
358 |
| - config_value = PARAMETERS["integration_tests"]["matrix"][config_name] |
| 359 | + if PARAMETERS["integration_tests"]["matrix"]["expanded"].get(config_name): |
| 360 | + config_value = PARAMETERS["integration_tests"]["matrix"]["expanded"][config_name] |
| 361 | + else: |
| 362 | + config_value = PARAMETERS["integration_tests"]["matrix"][config_name] |
359 | 363 | if len(config_value) > 1 and len(config) == len(config_value):
|
360 |
| - config = ["All %s" % config_name] |
| 364 | + config = ["All %d %s" % (len(config_value), config_name)] |
361 | 365 | elif config_name == "ios_device":
|
362 |
| - ftl_devices = {"ios_min", "ios_target", "ios_latest"} |
363 |
| - simulators = {"simulator_min", "simulator_target", "simulator_latest"} |
| 366 | + ftl_devices = set(filter(lambda device: TEST_DEVICES.get(device).get("type") in "real", config_value)) |
| 367 | + simulators = set(filter(lambda device: TEST_DEVICES.get(device).get("type") in "virtual", config_value)) |
364 | 368 | if ftl_devices.issubset(set(config)):
|
365 |
| - config.insert(0, "All FTL Devices") |
| 369 | + config.insert(0, "All %d FTL Devices" % len(ftl_devices)) |
366 | 370 | config = [x for x in config if (x not in ftl_devices)]
|
367 | 371 | elif simulators.issubset(set(config)):
|
368 |
| - config.insert(0, "All Simulators") |
| 372 | + config.insert(0, "All %d Simulators" % len(simulators)) |
369 | 373 | config = [x for x in config if (x not in simulators)]
|
370 | 374 | elif config_name == "android_device":
|
371 |
| - ftl_devices = {"android_min", "android_target", "android_latest"} |
372 |
| - emulators = {"emulator_min", "emulator_target", "emulator_latest"} |
| 375 | + ftl_devices = set(filter(lambda device: TEST_DEVICES.get(device).get("type") in "real", config_value)) |
| 376 | + emulators = set(filter(lambda device: TEST_DEVICES.get(device).get("type") in "virtual", config_value)) |
373 | 377 | if ftl_devices.issubset(set(config)):
|
374 |
| - config.insert(0, "All FTL Devices") |
| 378 | + config.insert(0, "All %d FTL Devices" % len(ftl_devices)) |
375 | 379 | config = [x for x in config if (x not in ftl_devices)]
|
376 | 380 | elif emulators.issubset(set(config)):
|
377 |
| - config.insert(0, "All Emulators") |
| 381 | + config.insert(0, "All %d Emulators" % len(emulators)) |
378 | 382 | config = [x for x in config if (x not in emulators)]
|
379 | 383 |
|
380 | 384 | return config
|
|
0 commit comments