From d53bea43b9b8126d3f62ef1872538da32c85df9c Mon Sep 17 00:00:00 2001 From: Liangliang He Date: Tue, 3 Apr 2018 10:41:36 +0800 Subject: [PATCH] Add random socs support in tests --- .gitlab-ci.yml | 6 ++++-- tools/bazel_adb_run.py | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02174941..b66f8bc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,11 @@ cpplint: ops_test: stage: ops_test script: - - python tools/bazel_adb_run.py --target="//mace/ops:ops_test" --run_target=True --stdout_processor=ops_test_stdout_processor + - if [ -z "$TARGET_SOCS" ]; then TARGET_SOCS=random; fi + - python tools/bazel_adb_run.py --target="//mace/ops:ops_test" --run_target=True --stdout_processor=ops_test_stdout_processor --target_socs=$TARGET_SOCS ops_benchmark: stage: ops_benchmark script: - - python tools/bazel_adb_run.py --target="//mace/ops:ops_benchmark" --run_target=True --stdout_processor=ops_benchmark_stdout_processor + - if [ -z "$TARGET_SOCS" ]; then TARGET_SOCS=random; fi + - python tools/bazel_adb_run.py --target="//mace/ops:ops_benchmark" --run_target=True --stdout_processor=ops_benchmark_stdout_processor --target_socs=$TARGET_SOCS diff --git a/tools/bazel_adb_run.py b/tools/bazel_adb_run.py index c78f9b9c..95a7df2b 100644 --- a/tools/bazel_adb_run.py +++ b/tools/bazel_adb_run.py @@ -9,6 +9,7 @@ import argparse +import random import re import sys @@ -49,7 +50,7 @@ def parse_args(): "--target_socs", type=str, default="all", - help="SoCs to build, comma seperated list (getprop ro.board.platform)") + help="SoCs(ro.board.platform) to build, comma seperated list or all/random") parser.add_argument( "--target", type=str, @@ -74,9 +75,11 @@ def parse_args(): def main(unused_args): target_socs = None - if FLAGS.target_socs != "all": + if FLAGS.target_socs != "all" and FLAGS.target_socs != "random": target_socs = set(FLAGS.target_socs.split(',')) target_devices = sh_commands.adb_devices(target_socs=target_socs) + if FLAGS.target_socs == "random": + target_devices = [random.choice(target_devices)] target = FLAGS.target host_bin_path, bin_name = sh_commands.bazel_target_to_bin(target) -- GitLab