Commit c5452522 authored by nednguyen@google.com's avatar nednguyen@google.com

Get rid of FromDict from robohornet_pro, scirra, spaceport, sunspider benchmarks.

BUG=239179

Review URL: https://codereview.chromium.org/258603004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266778 0039d316-1c4b-4281-b951-d872f2087c98
parent 8d8a9f12
......@@ -41,12 +41,11 @@ class RobohornetPro(test.Test):
test = _RobohornetProMeasurement
def CreatePageSet(self, options):
return page_set.PageSet.FromDict({
'archive_data_file': '../page_sets/data/robohornet_pro.json',
# Measurement require use of real Date.now() for measurement.
'make_javascript_deterministic': False,
'pages': [
{ 'url':
'http://ie.microsoft.com/testdrive/performance/robohornetpro/' }
]
}, os.path.abspath(__file__))
ps = page_set.PageSet(
archive_data_file='../page_sets/data/robohornet_pro.json',
# Measurement require use of real Date.now() for measurement.
make_javascript_deterministic=False,
file_path=os.path.abspath(__file__))
ps.AddPageWithDefaultRunNavigate(
'http://ie.microsoft.com/testdrive/performance/robohornetpro/')
return ps
......@@ -54,13 +54,15 @@ class ScirraBenchmark(test.Test):
"""WebGL and Canvas2D rendering benchmark suite."""
test = _ScirraMeasurement
def CreatePageSet(self, options):
return page_set.PageSet.FromDict({
'archive_data_file': '../page_sets/data/scirra.json',
'make_javascript_deterministic': False,
'pages': [
{ 'url': 'http://www.scirra.com/labs/renderperf3/'},
{ 'url': 'http://www.scirra.com/demos/c2/renderperfgl/'},
{ 'url': 'http://www.scirra.com/demos/c2/renderperf2d/'}
]
}, os.path.abspath(__file__))
ps = page_set.PageSet(
archive_data_file='../page_sets/data/scirra.json',
make_javascript_deterministic=False,
file_path=os.path.abspath(__file__))
for url in ('http://www.scirra.com/labs/renderperf3/',
'http://www.scirra.com/demos/c2/renderperfgl/',
'http://www.scirra.com/demos/c2/renderperf2d/'):
ps.AddPageWithDefaultRunNavigate(url)
return ps
......@@ -73,6 +73,6 @@ class Spaceport(test.Test):
def CreatePageSet(self, options):
spaceport_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test',
'data', 'third_party', 'spaceport')
return page_set.PageSet.FromDict(
{'pages': [{'url': 'file://index.html'}]},
spaceport_dir)
ps = page_set.PageSet(file_path=spaceport_dir)
ps.AddPageWithDefaultRunNavigate('file://index.html')
return ps
......@@ -56,9 +56,9 @@ class Sunspider(test.Test):
test = _SunspiderMeasurement
def CreatePageSet(self, options):
return page_set.PageSet.FromDict(
{
'archive_data_file': '../page_sets/data/sunspider.json',
'make_javascript_deterministic': False,
'pages': [{ 'url': _URL }],
}, os.path.abspath(__file__))
ps = page_set.PageSet(
archive_data_file='../page_sets/data/sunspider.json',
make_javascript_deterministic=False,
file_path=os.path.abspath(__file__))
ps.AddPageWithDefaultRunNavigate(_URL)
return ps
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment