diff options
| author | Caroline Tice <cmtice@google.com> | 2015-11-04 14:03:14 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-11-05 05:46:17 +0000 |
| commit | 80eab98c8820e503118ba0962cf9f0f74a51e28d (patch) | |
| tree | a874ca238bc25947a1b6a256e2363faf6a732b3b /test_toolchains.py | |
| parent | 1af9294993f129f2286c961a19a04babddd2572d (diff) | |
| download | toolchain-utils-80eab98c8820e503118ba0962cf9f0f74a51e28d.tar.gz | |
Make 'label' names more meaningful in nightly tests.
The nightly crosperf tests currently use the label 'test_image' for
the images that we build or that the trybot built. This is not
a very informative name. This CL tries to make the names a least a
little bit more useful.
BUG=None
TEST=Tested by hand in role account directory tree.
Change-Id: Ib88f711ec96ec5cb71efebae79a76e6e8ebc784a
Reviewed-on: https://chrome-internal-review.googlesource.com/237796
Commit-Ready: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Reviewed-by: Luis Lozano <llozano@chromium.org>
Diffstat (limited to 'test_toolchains.py')
| -rwxr-xr-x | test_toolchains.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/test_toolchains.py b/test_toolchains.py index ceb39280..0c6f1d82 100755 --- a/test_toolchains.py +++ b/test_toolchains.py @@ -4,6 +4,7 @@ import datetime import optparse import os +import string import sys import build_chromeos import setup_chromeos @@ -14,7 +15,6 @@ from utils import logger CROSTC_ROOT = "/usr/local/google/crostc" -AFDO_BOARDS = ["butterfly", "lumpy", "stumpy", "stout", "parrot", "parrot_ivb"] MAIL_PROGRAM = "~/var/bin/mail-sheriff" WEEKLY_REPORTS_ROOT = os.path.join(CROSTC_ROOT, "weekly_test_data") PENDING_ARCHIVES_DIR = os.path.join(CROSTC_ROOT, "pending_archives") @@ -72,6 +72,12 @@ class ChromeOSCheckout(object): image_parts = last_piece.split(".") self._build_num = image_parts[0] + def _BuildLabelName(self, config, board): + pieces = config.split("/") + compiler_version = pieces[-1] + label = compiler_version + "_tot_afdo" + return label + def _BuildAndImage(self, label=""): if (not label or not misc.DoesLabelExist(self._chromeos_root, self._board, label)): @@ -82,9 +88,6 @@ class ChromeOSCheckout(object): if self._public: build_chromeos_args.append("--env=USE=-chrome_internal") - if self._board in AFDO_BOARDS: - build_chromeos_args.append("--env=USE=afdo_use") - ret = build_chromeos.Main(build_chromeos_args) if ret != 0: raise RuntimeError("Couldn't build ChromeOS!") @@ -212,8 +215,8 @@ class ToolchainComparator(ChromeOSCheckout): for label in labels: # TODO(asharif): Fix crosperf so it accepts labels with symbols crosperf_label = label - crosperf_label = crosperf_label.replace("-", "minus") - crosperf_label = crosperf_label.replace("+", "plus") + crosperf_label = crosperf_label.replace("-", "_") + crosperf_label = crosperf_label.replace("+", "_") crosperf_label = crosperf_label.replace(".", "") # Use the official build instead of building vanilla ourselves. @@ -312,7 +315,7 @@ class ToolchainComparator(ChromeOSCheckout): labels = [] labels.append("vanilla") for config in self._configs: - label = misc.GetFilenameFromString(config.gcc_config.githash) + label = self._BuildLabelName(config.gcc_config.githash, self._board) if (not misc.DoesLabelExist(self._chromeos_root, self._board, label)): |