mozilla-central: changeset 108067:2f9d00b31660f9e972abc0018ff6edb2a4aeb110

author	Karl Tomlinson <karlt+@karlt.net>
	Tue, 25 Sep 2012 16:19:25 +1200
changeset 108067	2f9d00b31660f9e972abc0018ff6edb2a4aeb110
parent 108066	5839bb1b2297bb14e639caa2373650da245277f2
child 108068	ef440fbe0d521b96cdc6e34540381a7eb1fa1aa3
push id	23533
push user	mlamouri@mozilla.com
push date	Wed, 26 Sep 2012 10:57:37 +0000
treeherder	mozilla-central@df69d95f636c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ted
bugs	793079
milestone	18.0a1
first release with	nightly linux32 b038e9e2023f / 18.0a1 / 20120927030539 / files nightly linux64 b038e9e2023f / 18.0a1 / 20120927030539 / files nightly mac b038e9e2023f / 18.0a1 / 20120927030539 / files nightly win32 b038e9e2023f / 18.0a1 / 20120927030539 / files nightly win64 b038e9e2023f / 18.0a1 / 20120927030539 / files
last release without	nightly linux32 08d435dedc7f / 18.0a1 / 20120925030547 / files nightly linux64 08d435dedc7f / 18.0a1 / 20120925030547 / files nightly mac 08d435dedc7f / 18.0a1 / 20120925030547 / files nightly win32 08d435dedc7f / 18.0a1 / 20120925030547 / files nightly win64 08d435dedc7f / 18.0a1 / 20120925030547 / files

--- a/build/leaktest.py.in
+++ b/build/leaktest.py.in
@@ -41,12 +41,10 @@ if __name__ == '__main__':
     automation.initializeProfile(PROFILE_DIRECTORY)
     browserEnv = automation.environment()
 
     if not "XPCOM_DEBUG_BREAK" in browserEnv:
         browserEnv["XPCOM_DEBUG_BREAK"] = "stack"
     url = "http://localhost:%d/bloatcycle.html" % PORT
     appPath = os.path.join(SCRIPT_DIR, automation.DEFAULT_APP)
     status = automation.runApp(url, browserEnv, appPath, PROFILE_DIRECTORY,
-                               # leaktest builds are slow, give up and
-                               # don't use a timeout.
-                               extraArgs, timeout=None)
+                               extraArgs, timeout=1800)
     sys.exit(status)