From cfc4fe3377e290438a4681160a78c2f0a74d0798 Mon Sep 17 00:00:00 2001 From: "anodelman%mozilla.com" Date: Tue, 4 Dec 2007 22:01:25 +0000 Subject: [PATCH] Bug 406835 - set timeout on any page in tp to 2 minutes (for talos tests) a=anodelman r=rcampbell git-svn-id: svn://10.0.0.236/trunk@240445 18797224-902f-48f8-a5cc-f745e15eee43 --- .../testing/talos/perfmaster/configs/sample.config | 2 +- .../testing/talos/perfmaster/configs/sample.config.nogfx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config index e87e0f99755..f24448583cb 100644 --- a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config +++ b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config @@ -77,7 +77,7 @@ tests : win_counters : [] unix_counters : [] tp: - url : '-tp page_load_test/manifest.txt -tpchrome -tpformat tinderbox -tpcycles 10' + url : '-tp page_load_test/manifest.txt -tpchrome -tpformat tinderbox -tpcycles 10 -tptimeout 120000' resolution : 1 cycles : 1 win_counters : ['Working Set', 'Private Bytes', '% Processor Time'] diff --git a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config.nogfx b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config.nogfx index dec8d416d4d..010e7e722d4 100644 --- a/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config.nogfx +++ b/mozilla/tools/buildbot-configs/testing/talos/perfmaster/configs/sample.config.nogfx @@ -77,7 +77,7 @@ tests : win_counters : [] unix_counters : [] tp: - url : '-tp page_load_test/manifest.txt -tpchrome -tpformat tinderbox -tpcycles 10' + url : '-tp page_load_test/manifest.txt -tpchrome -tpformat tinderbox -tpcycles 10 -tptimeout 120000' resolution : 1 cycles : 1 win_counters : ['Working Set', 'Private Bytes', '% Processor Time']