diff options
| author | luqui@chromium.org <luqui@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 03:39:52 +0000 |
|---|---|---|
| committer | luqui@chromium.org <luqui@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 03:39:52 +0000 |
| commit | c79bc8ad5ceaa732b1e120536cfbde0bb6d78ef2 (patch) | |
| tree | 24f8186513ae6a359a29c38d7a7a6c72691ec368 /build/android | |
| parent | de92efa5511d36033c5770fbd7a0643ff98978f5 (diff) | |
| download | chromium_src-c79bc8ad5ceaa732b1e120536cfbde0bb6d78ef2.zip chromium_src-c79bc8ad5ceaa732b1e120536cfbde0bb6d78ef2.tar.gz chromium_src-c79bc8ad5ceaa732b1e120536cfbde0bb6d78ef2.tar.bz2 | |
Fix gs url in logcat dump, and set content type to text/plain
BUG=362787
TBR=navabi@chromium.org
Review URL: https://codereview.chromium.org/250153003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
| -rwxr-xr-x | build/android/buildbot/bb_device_steps.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py index 10dfa15..47842b2 100755 --- a/build/android/buildbot/bb_device_steps.py +++ b/build/android/buildbot/bb_device_steps.py @@ -35,6 +35,7 @@ import errors SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave') LOGCAT_DIR = os.path.join(bb_utils.CHROME_OUT_DIR, 'logcat') GS_URL = 'https://storage.googleapis.com' +GS_AUTH_URL = 'https://storage.cloud.google.com' # Describes an instrumation test suite: # test: Name of test we're running. @@ -512,6 +513,8 @@ def MakeGSPath(options, gs_base_dir): bot_id = options.build_properties.get('buildername', 'testing') randhash = hashlib.sha1(str(random.random())).hexdigest() gs_path = '%s/%s/%s/%s' % (gs_base_dir, bot_id, revision, randhash) + # remove double slashes, happens with blank revisions and confuses gsutil + gs_path = re.sub('/+', '/', gs_path) return gs_path def UploadHTML(options, gs_base_dir, dir_to_upload, link_text, @@ -553,8 +556,9 @@ def LogcatDump(options): RunCmd([SrcPath('build' , 'android', 'adb_logcat_printer.py'), '--output-path', logcat_file, LOGCAT_DIR]) gs_path = MakeGSPath(options, 'chromium-android/logcat_dumps') - RunCmd([bb_utils.GSUTIL_PATH, 'cp', logcat_file, 'gs://%s' % gs_path]) - bb_annotations.PrintLink('logcat dump', '%s/%s' % (GS_URL, gs_path)) + RunCmd([bb_utils.GSUTIL_PATH, '-h', 'Content-Type:text/plain', + 'cp', logcat_file, 'gs://%s' % gs_path]) + bb_annotations.PrintLink('logcat dump', '%s/%s' % (GS_AUTH_URL, gs_path)) def RunStackToolSteps(options): |