diff options
author | cmtice <cmtice@google.com> | 2014-04-16 14:48:47 -0700 |
---|---|---|
committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-04-21 20:54:52 +0000 |
commit | 98a53692fb946a8eac46e3e82257f540d1350c18 (patch) | |
tree | 330fee723ed07a69fccf88fe6a86d806c0c016f5 /crosperf/results_cache.py | |
parent | 71e004237b85bdcab97c09b7f58305e5f5eff7f8 (diff) | |
download | toolchain-utils-98a53692fb946a8eac46e3e82257f540d1350c18.tar.gz |
Clean up Crosperf options and help.
Crosperf's help was completely out of date and incorrect. Fixed
that. Also, I cleaned up the options, removed some that were no
longer appropriate or not ever used, and made some options global-only.
Also removed all references to pyauto. We no longer use or run pyauto
tests.
Option changes: Completely removed outlier_range (it was not actually doing
anything), key_results_only (applied only to pyauto tests), use_test_that
(not needed now that we're not using pyauto) and md5sum (never used).
Made the following options global-only: rm_chroot_tmp, perf_args, logging_level,
show_all_results, board. Removed 'build' from global settings and made
it an image-only setting (it made no sense as a global setting).
I also adjusted the unittests to work with these changes.
BUG=None
TEST=I tested all the options in all their various positions; I tested with and
wtihout caching; and I tested local and official images. I also ran the unittests. Everything works.
Change-Id: I7653663f65c0a3363a1904c0220f1066e72c7f9d
Reviewed-on: https://chrome-internal-review.googlesource.com/160758
Reviewed-by: Bhaskar Janakiraman <bjanakiraman@google.com>
Reviewed-by: Yunlian Jiang <yunlian@google.com>
Commit-Queue: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Diffstat (limited to 'crosperf/results_cache.py')
-rw-r--r-- | crosperf/results_cache.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/crosperf/results_cache.py b/crosperf/results_cache.py index 43f0d1e8..91d2b437 100644 --- a/crosperf/results_cache.py +++ b/crosperf/results_cache.py @@ -304,7 +304,11 @@ class Result(object): def CleanUp(self, rm_chroot_tmp): if rm_chroot_tmp and self.results_dir: - command = "rm -rf %s" % self.results_dir + dirname, basename = misc.GetRoot(self.results_dir) + if basename.find("test_that_results_") != -1: + command = "rm -rf %s" % self.results_dir + else: + command = "rm -rf %s" % dirname self._ce.RunCommand(command) if self._temp_dir: command = "rm -rf %s" % self._temp_dir @@ -352,9 +356,9 @@ class Result(object): @classmethod def CreateFromRun(cls, logger, log_level, label, out, err, retval, show_all, - test, suite="pyauto"): + test, suite="telemetry_Crosperf"): if suite == "telemetry": - result = TelemetryResult(logger, label) + result = TelemetryResult(logger, label, log_level) else: result = cls(logger, label, log_level) result._PopulateFromRun(out, err, retval, show_all, test, suite) @@ -362,7 +366,7 @@ class Result(object): @classmethod def CreateFromCacheHit(cls, logger, log_level, label, cache_dir, - show_all, test, suite="pyauto"): + show_all, test, suite="telemetry_Crosperf"): if suite == "telemetry": result = TelemetryResult(logger, label) else: @@ -378,8 +382,8 @@ class Result(object): class TelemetryResult(Result): - def __init__(self, logger, label): - super(TelemetryResult, self).__init__(logger, label) + def __init__(self, logger, label, log_level): + super(TelemetryResult, self).__init__(logger, label, log_level) def _PopulateFromRun(self, out, err, retval, show_all, test, suite): self.out = out |