commit b5ea3b4b4b724e6cf1bd2e0cf13cb2e2693b100b
author Chris Sosa <sosa@chromium.org> Thu Oct 25 15:25:20 2012 -0700
committer Gerrit <chrome-bot@google.com> Thu Oct 25 20:09:25 2012 -0700
tree 8e1b03ba121f931086355b033a8b34108ff40dcd
parent 3969b7b9689260fa533a7556e64a658bf868c48e

Copy perf results file into log directory before printing out.

Also adding to trybots.

BUG=chromium-os:35659
TEST=unittests + pylint

Change-Id: Iaf8d2c2bcc372ab0f5938e2553145d2a61d78497
Reviewed-on: https://gerrit.chromium.org/gerrit/36602
Commit-Ready: Chris Sosa <sosa@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Peter Mayo <petermayo@chromium.org>

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index bc38190..6ca982c 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -1205,13 +1205,13 @@
                  'rather than the root of it.  This is not supported.'
                  % options.buildroot)
 
+  if not options.log_dir:
+    options.log_dir = os.path.join(options.buildroot, _DEFAULT_LOG_DIR)
+
   log_file = None
   if options.tee:
-    default_dir = os.path.join(options.buildroot, _DEFAULT_LOG_DIR)
-    dirname = options.log_dir or default_dir
-    log_file = os.path.join(dirname, _BUILDBOT_LOG_FILE)
-
-    osutils.SafeMakedirs(dirname)
+    log_file = os.path.join(options.log_dir, _BUILDBOT_LOG_FILE)
+    osutils.SafeMakedirs(options.log_dir)
     _BackupPreviousLog(log_file)
 
   with cros_build_lib.ContextManagerStack() as stack: