diff options
| author | cmtice <cmtice@google.com> | 2013-11-04 16:38:37 -0500 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2013-11-06 08:21:31 +0000 |
| commit | 0440388677b2445f4f8273b6c2b4d82601b1aca3 (patch) | |
| tree | 87678e20fb60fc1f4e4f82c32b24084744685db2 | |
| parent | 28ed8f65f751c000c676ea67bdb2b0e20f73038a (diff) | |
| download | toolchain-utils-0440388677b2445f4f8273b6c2b4d82601b1aca3.tar.gz | |
Make changes to run Telemetry tests in nightly infrastructure tests.
BUG=None
TEST=Tested this running the nightly infrastructure cron jobs.
Change-Id: I6cccee222b074e9410b45df6750c097430207746
Reviewed-on: https://chrome-internal-review.googlesource.com/147515
Reviewed-by: Luis Lozano <llozano@chromium.org>
Commit-Queue: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
| -rw-r--r-- | crosperf/experiment_factory.py | 3 | ||||
| -rw-r--r-- | crosperf/label.py | 3 | ||||
| -rwxr-xr-x | setup_chromeos.py | 14 | ||||
| -rw-r--r-- | test_toolchains.py | 6 |
4 files changed, 10 insertions, 16 deletions
diff --git a/crosperf/experiment_factory.py b/crosperf/experiment_factory.py index 5b9579fa..886feada 100644 --- a/crosperf/experiment_factory.py +++ b/crosperf/experiment_factory.py @@ -27,7 +27,8 @@ telemetry_perfv2_tests = [ 'dromaeo.domcoreattr', 'dromaeo.domcorequery', 'dromaeo.domcoretraverse', 'kraken', - 'memory.top_25', +# The following benchmark is extremely flaky, so omit it for now. +# 'memory.top_25', 'octane', 'robohornet_pro', 'smoothness.top_25', diff --git a/crosperf/label.py b/crosperf/label.py index 544f53d8..c63880e1 100644 --- a/crosperf/label.py +++ b/crosperf/label.py @@ -42,6 +42,9 @@ class Label(object): if not chrome_src: self.chrome_src = os.path.join(self.chromeos_root, "chroot/var/cache/chromeos-chrome/chrome-src-internal/src") + if not os.path.exists(self.chrome_src): + self.chrome_src = os.path.join(self.chromeos_root, + "chroot/var/cache/chromeos-chrome/chrome-src/src") else: chromeos_src = misc.CanonicalizePath(chrome_src) if not chromeos_src: diff --git a/setup_chromeos.py b/setup_chromeos.py index 689b1ec9..c52c4e68 100755 --- a/setup_chromeos.py +++ b/setup_chromeos.py @@ -217,20 +217,12 @@ Use in combination with --version=latest or --version=common. Use if ret: return ret - # Setup svn credentials for use inside the chroot - if getpass.getuser() == "mobiletc-prebuild": - chromium_username = "raymes" - else: - chromium_username = "$USER" - return cmd_executer.RunCommand( - "svn ls --config-option config:auth:password-stores= " - "--config-option " - "servers:global:store-plaintext-passwords=yes " - "--username " + chromium_username + "@google.com " + "svn ls " "svn://svn.chromium.org/leapfrog-internal " "svn://svn.chromium.org/chrome " - "svn://svn.chromium.org/chrome-internal > /dev/null") + "svn://svn.chromium.org/chrome-internal " + "svn://svn.chromium.org/blink > /dev/null") if __name__ == "__main__": diff --git a/test_toolchains.py b/test_toolchains.py index 9a076353..a767fd8a 100644 --- a/test_toolchains.py +++ b/test_toolchains.py @@ -77,9 +77,6 @@ class ChromeOSCheckout(object): def _CheckoutChromeOS(self): # TODO(asharif): Setup a fixed ChromeOS version (quarterly snapshot). if not os.path.exists(self._chromeos_root): - #setup_chromeos_args = [setup_chromeos.__file__, - # "--dir=%s" % self._chromeos_root, - # "--minilayout"] setup_chromeos_args = [setup_chromeos.__file__, "--dir=%s" % self._chromeos_root] if self._public: @@ -119,7 +116,8 @@ class ToolchainComparator(ChromeOSCheckout): remote: %s """ % (self._board, self._remotes) experiment_tests = """ - benchmark: desktopui_PyAutoPerfTests { + benchmark: all_perfv2 { + suite: telemetry_Crosperf iterations: 1 } """ |