From bd3cc904005154db183c9bed64fcf587f894db79 Mon Sep 17 00:00:00 2001 From: "anodelman%mozilla.com" Date: Fri, 4 Jan 2008 21:43:43 +0000 Subject: [PATCH] Bug 410702 - add per page timeouts to tgfx/tdhtml/tsvg a=anodelman r=rcampbell --- .../talos/perfmaster/configs/production.sample.config | 6 +++--- .../talos/perfmaster/configs/production.sample.config.nogfx | 4 ++-- .../testing/talos/perfmaster/configs/sample.config | 6 +++--- .../testing/talos/perfmaster/configs/sample.config.nogfx | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/buildbot-configs/testing/talos/perfmaster/configs/production.sample.config b/tools/buildbot-configs/testing/talos/perfmaster/configs/production.sample.config index f6d2d1e6002..62233a95d23 100644 --- a/tools/buildbot-configs/testing/talos/perfmaster/configs/production.sample.config +++ b/tools/buildbot-configs/testing/talos/perfmaster/configs/production.sample.config @@ -90,19 +90,19 @@ tests : # win_counters : ['Working Set', 'Private Bytes', '% Processor Time'] # unix_counters: ['RSS', 'Private Bytes'] tdhtml: - url: '-tp page_load_test/dhtml/dhtml.manifest -tpchrome -tpformat tinderbox -tpcycles 5' + url: '-tp page_load_test/dhtml/dhtml.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tptimeout 120000' resolution : 1 cycles : 1 win_counters : [] unix_counters : [] tgfx: - url: '-tp page_load_test/gfx/gfx.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tprender' + url: '-tp page_load_test/gfx/gfx.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tprender -tptimeout 300000' resolution : 1 cycles : 1 win_counters : [] unix_counters : [] tsvg: - url: '-tp page_load_test/svg/svg.manifest -tpchrome -tpformat tinderbox -tpcycles 5' + url: '-tp page_load_test/svg/svg.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tptimeout 120000' resolution : 1 cycles : 1 win_counters : [] diff --git a/tools/buildbot-configs/testing/talos/perfmaster/configs/production.sample.config.nogfx b/tools/buildbot-configs/testing/talos/perfmaster/configs/production.sample.config.nogfx index 8eea17ee59c..ea99670fe25 100644 --- a/tools/buildbot-configs/testing/talos/perfmaster/configs/production.sample.config.nogfx +++ b/tools/buildbot-configs/testing/talos/perfmaster/configs/production.sample.config.nogfx @@ -90,13 +90,13 @@ tests : # win_counters : ['Working Set', 'Private Bytes', '% Processor Time'] # unix_counters: ['RSS', 'Private Bytes'] tdhtml: - url: '-tp page_load_test/dhtml/dhtml.manifest -tpchrome -tpformat tinderbox -tpcycles 5' + url: '-tp page_load_test/dhtml/dhtml.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tptimeout 120000' resolution : 1 cycles : 1 win_counters : [] unix_counters : [] tsvg: - url: '-tp page_load_test/svg/svg.manifest -tpchrome -tpformat tinderbox -tpcycles 5' + url: '-tp page_load_test/svg/svg.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tptimeout 120000' resolution : 1 cycles : 1 win_counters : [] diff --git a/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config b/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config index 393d49fda05..d36506b9391 100644 --- a/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config +++ b/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config @@ -90,19 +90,19 @@ tests : # win_counters : ['Working Set', 'Private Bytes', '% Processor Time'] # unix_counters: ['RSS', 'Private Bytes'] tdhtml: - url: '-tp page_load_test/dhtml/dhtml.manifest -tpchrome -tpformat tinderbox -tpcycles 5' + url: '-tp page_load_test/dhtml/dhtml.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tptimeout 120000' resolution : 1 cycles : 1 win_counters : [] unix_counters : [] tgfx: - url: '-tp page_load_test/gfx/gfx.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tprender' + url: '-tp page_load_test/gfx/gfx.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tprender -tptimeout 300000' resolution : 1 cycles : 1 win_counters : [] unix_counters : [] tsvg: - url: '-tp page_load_test/svg/svg.manifest -tpchrome -tpformat tinderbox -tpcycles 5' + url: '-tp page_load_test/svg/svg.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tptimeout 120000' resolution : 1 cycles : 1 win_counters : [] diff --git a/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config.nogfx b/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config.nogfx index d133ab3e560..eec684733ea 100644 --- a/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config.nogfx +++ b/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config.nogfx @@ -90,13 +90,13 @@ tests : # win_counters : ['Working Set', 'Private Bytes', '% Processor Time'] # unix_counters: ['RSS', 'Private Bytes'] tdhtml: - url: '-tp page_load_test/dhtml/dhtml.manifest -tpchrome -tpformat tinderbox -tpcycles 5' + url: '-tp page_load_test/dhtml/dhtml.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tptimeout 120000' resolution : 1 cycles : 1 win_counters : [] unix_counters : [] tsvg: - url: '-tp page_load_test/svg/svg.manifest -tpchrome -tpformat tinderbox -tpcycles 5' + url: '-tp page_load_test/svg/svg.manifest -tpchrome -tpformat tinderbox -tpcycles 5 -tptimeout 120000' resolution : 1 cycles : 1 win_counters : []