Merge branch 'aosp/mirror-chromium-master' into update_utils am: 4307f4735e am: 18caef1edd am: 6c551e0d52 am: ddfea1f7e7android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-dev

am: f1a93c225b

Change-Id: I60d258ddb8fd0bf9632f1f70c5cdeb3078938059

1 files changed, 0 insertions, 90 deletions

diff --git a/user_activity_benchmarks/collect_telemetry_profiles.sh b/user_activity_benchmarks/collect_telemetry_profiles.sh
deleted file mode 100755
index 0583adca..00000000
--- a/user_activity_benchmarks/collect_telemetry_profiles.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-# Copyright 2016 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# Runs the Telemetry benchmarks with AutoTest and collects their perf profiles.
-# Reads the benchmark names from the telemetry_benchmark_file. Each benchmark
-# should be placed on a separate line.
-# The profile results are placed in the results_path.
-
-set -e
-
-if [ "$#" -ne 5 ]; then
-  echo "USAGE: collect_telemetry_profiles.sh board chrome_root_path " \
-  "machine_ip results_path telemetry_benchmarks_file"
-  exit 1
-fi
-
-# CHROME_ROOT should contain the path with the source of Chrome. This is used by
-# AutoTest.
-export CHROME_ROOT=$2
-
-readonly BOARD=$1
-readonly IP=$3
-readonly RESULTS_PATH=$4
-readonly TELEMETRY_BENCHMARKS_FILE=$5
-
-# The following Telemetry benchmarks failed for the R52-8350.68.0 Chrome OS
-# version: page_cycler_v2.top_10_mobile,
-# page_cycler_v2.basic_oopif, smoothness.tough_filters_cases,
-# page_cycler_v2.intl_hi_ru,
-# image_decoding.image_decoding_measurement, system_health.memory_mobile,
-# memory.top_7_stress, smoothness.tough_path_rendering_cases,
-# page_cycler_v2.tough_layout_cases,
-# memory.long_running_idle_gmail_background_tbmv2, smoothness.tough_webgl_cases,
-# smoothness.tough_canvas_cases, smoothness.tough_texture_upload_cases,
-# top_10_mobile_memory_ignition, startup.large_profile.cold.blank_page,
-# page_cycler_v2.intl_ar_fa_he, start_with_ext.cold.blank_page,
-# start_with_ext.warm.blank_page, page_cycler_v2.intl_ko_th_vi,
-# smoothness.scrolling_tough_ad_case, page_cycler_v2_site_isolation.basic_oopif,
-# smoothness.tough_scrolling_cases, startup.large_profile.warm.blank_page,
-# page_cycler_v2.intl_es_fr_pt-BR, page_cycler_v2.intl_ja_zh,
-# memory.long_running_idle_gmail_tbmv2, smoothness.scrolling_tough_ad_cases,
-# page_cycler_v2.typical_25, smoothness.tough_webgl_ad_cases,
-# smoothness.tough_image_decode_cases.
-#
-# However, we did not manage to collect the profiles only from the following
-# benchmarks: smoothness.tough_filters_cases,
-# smoothness.tough_path_rendering_cases, page_cycler_v2.tough_layout_cases,
-# smoothness.tough_webgl_cases, smoothness.tough_canvas_cases,
-# smoothness.tough_texture_upload_cases, smoothness.tough_scrolling_cases,
-# smoothness.tough_webgl_ad_cases, smoothness.tough_image_decode_cases.
-#
-# Use ./run_benchmark --browser=cros-chrome --remote=$IP list to get the list of
-# Telemetry benchmarks.
-readonly LATEST_PERF_PROFILE=/tmp/test_that_latest/results-1-telemetry_Crosperf/telemetry_Crosperf/profiling/perf.data
-
-while read benchmark
-do
-  # TODO(evelinad): We should add -F 4000000 to the list of profiler_args
-  # arguments because we need to use the same sampling period as the one used
-  # to collect the CWP user data (4M number of cycles for cycles.callgraph).
-  test_that --debug  --board=${BOARD} --args=" profiler=custom_perf \
-    profiler_args='record -g -a -e cycles,instructions' \
-    run_local=False test=$benchmark " $IP telemetry_Crosperf
-  if [ $? -ne 0 ]; then
-    echo "Failed to run the $benchmark telemetry benchmark with Autotest."
-    continue
-  fi
-  echo "Warning: Sampling period is too high. It should be set to 4M samples."
-
-  cp "$LATEST_PERF_PROFILE" "$RESULTS_PATH/${benchmark}.data"
-  if [ $? -ne 0 ]; then
-    echo "Failed to move the perf profile file from $LATEST_PERF_PROFILE to " \
-      "$PERF_DATA_RESULTS_PATH/${benchmark}.data for the $benchmark " \
-      "telemetry benchmark."
-    continue
-  fi
-
-  # The ssh connection should be configured without password. We need to do
-  # this step because we might run out of disk space if we run multiple
-  # benchmarks.
-  ssh root@$IP "rm -rf /usr/local/profilers/*"
-  if [ $? -ne 0 ]; then
-    echo "Failed to remove the output files from /usr/local/profilers/ for " \
-      "the $benchmark telemetry benchmark."
-    continue
-  fi
-done < $TELEMETRY_BENCHMARKS_FILE
-