dump screen width/height/colorDepth to console b=382521 p=anodelman r=rhelmer
git-svn-id: svn://10.0.0.236/trunk@227305 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rhelmer%mozilla.com
parent
0e871606e4
commit
e91fe90193
@ -65,6 +65,9 @@ REPORTS_DIR = r'c:\extension_perf_reports'
|
||||
"""The path to the file url to load when initializing a new profile"""
|
||||
INIT_URL = 'file:///c:/win32/initialize.html'
|
||||
|
||||
"""The path to the file url to load when collecting information from the browser"""
|
||||
INFO_URL = 'file:///c:/win32/getInfo.html'
|
||||
|
||||
"""The path to the file url to load for startup test (Ts)"""
|
||||
TS_URL = 'file:///c:/win32/startup_test/startup_test.html?begin='
|
||||
|
||||
|
||||
57
mozilla/testing/performance/talos/ffinfo.py
Normal file
57
mozilla/testing/performance/talos/ffinfo.py
Normal file
@ -0,0 +1,57 @@
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is standalone Firefox Windows performance test.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Google Inc.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2006
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Alice Nodelman <anodelman@mozilla.com> (original author)
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
__author__ = 'anodelman@mozilla.com'
|
||||
|
||||
import re
|
||||
import ffprocess
|
||||
import config
|
||||
|
||||
PROFILE_REGEX = re.compile('__metrics(.*)')
|
||||
|
||||
def GetMetricsFromBrowser(firefox_path, profile_dir):
|
||||
"""Opens the browser at the specified URL, prints out the information collected from
|
||||
the browser"""
|
||||
cmd = ffprocess.GenerateFirefoxCommandLine(firefox_path, profile_dir, config.INFO_URL)
|
||||
(match, timed_out) = ffprocess.RunProcessAndWaitForOutput(cmd,
|
||||
'firefox',
|
||||
PROFILE_REGEX,
|
||||
30)
|
||||
if (not timed_out):
|
||||
print match
|
||||
else:
|
||||
print "ERROR:no metrics"
|
||||
|
||||
52
mozilla/testing/performance/talos/getInfo.html
Normal file
52
mozilla/testing/performance/talos/getInfo.html
Normal file
@ -0,0 +1,52 @@
|
||||
<!-- ***** BEGIN LICENSE BLOCK *****
|
||||
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
-
|
||||
- The contents of this file are subject to the Mozilla Public License Version
|
||||
- 1.1 (the "License"); you may not use this file except in compliance with
|
||||
- the License. You may obtain a copy of the License at
|
||||
- http://www.mozilla.org/MPL/
|
||||
-
|
||||
- Software distributed under the License is distributed on an "AS IS" basis,
|
||||
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
- for the specific language governing rights and limitations under the
|
||||
- License.
|
||||
-
|
||||
- The Original Code is Windows performance test.
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- Google Inc.
|
||||
- Portions created by the Initial Developer are Copyright (C) 1999
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s):
|
||||
- Annie Sullivan <annie.sullivan@gmail.com>
|
||||
- Alice Nodelman <anodelman@mozilla.com>
|
||||
-
|
||||
- Alternatively, the contents of this file may be used under the terms of
|
||||
- either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
- in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
- of those above. If you wish to allow use of your version of this file only
|
||||
- under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
- use your version of this file under the terms of the MPL, indicate your
|
||||
- decision by deleting the provisions above and replace them with the notice
|
||||
- and other provisions required by the LGPL or the GPL. If you do not delete
|
||||
- the provisions above, a recipient may use your version of this file under
|
||||
- the terms of any one of the MPL, the GPL or the LGPL.
|
||||
-
|
||||
- ***** END LICENSE BLOCK ***** -->
|
||||
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
<head>
|
||||
<title>shutdown script</title>
|
||||
</head>
|
||||
|
||||
<body onload="
|
||||
if (window.dump) {
|
||||
dump('\n\n__metricsScreen width:' + screen.width + ' Screen height:' + screen.height + ' colorDepth:' + screen.colorDepth);
|
||||
}
|
||||
window.close();
|
||||
">
|
||||
</body>
|
||||
</html>
|
||||
@ -57,6 +57,7 @@ import sys
|
||||
|
||||
import ffprocess
|
||||
import ffprofile
|
||||
import ffinfo
|
||||
import config
|
||||
|
||||
if config.OS == "linux":
|
||||
@ -116,6 +117,7 @@ def RunPltTests(profile_configs,
|
||||
# a performance hit, and the second Firefox that gets created is properly
|
||||
# terminated.
|
||||
ffprofile.InitializeNewProfile(pconfig[2], profile_dir)
|
||||
ffinfo.GetMetricsFromBrowser(pconfig[2], profile_dir)
|
||||
print "initialized firefox"
|
||||
sys.stdout.flush()
|
||||
ffprocess.SyncAndSleep()
|
||||
|
||||
@ -54,6 +54,7 @@ import time
|
||||
|
||||
import ffprocess
|
||||
import ffprofile
|
||||
import ffinfo
|
||||
import config
|
||||
|
||||
|
||||
@ -134,6 +135,7 @@ def RunStartupTests(profile_configs, num_runs):
|
||||
# cause a performance hit, and the second Firefox that gets
|
||||
# created is properly terminated.
|
||||
ffprofile.InitializeNewProfile(config[2], profile_dir)
|
||||
ffinfo.GetMetricsFromBrowser(config[2], profile_dir)
|
||||
|
||||
# Run the startup tests for this profile and log the results.
|
||||
times = RunStartupTest(config[2], profile_dir, 5, 10)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user