<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185732] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185732">185732</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-18 19:32:40 -0700 (Thu, 18 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Extend capability of run-benchmark script to support mobile device
https://bugs.webkit.org/show_bug.cgi?id=146125
Patch by Dewei Zhu <dewei_zhu@apple.com> on 2015-06-18
Reviewed by Ryosuke Niwa.
Extend capability of run-benchmark to support mobile device, and move majority of run-benchmark script code to
benchmark_runner directory, and make run-benchmark a wrapping script. Also correct a typo.
* Scripts/run-benchmark:
(main): Deleted.
* Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
(BenchmarkRunner.__init__):
(BenchmarkRunner.execute):
* Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
(BrowserDriver.prepareEnv):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
(OSXBrowserDriver.prepareEnv):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver.prepareEnv):
* Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py:
(HTTPServerDriver.getReturnCode):
(HTTPServerDriver):
(HTTPServerDriver.setDeviceID):
* Scripts/webkitpy/benchmark_runner/run_benchmark.py: Copied from Tools/Scripts/run-benchmark.
(parse_args):
(start):
(main):
* Scripts/webkitpy/benchmark_runner/utils.py:
(getPathFromProjectRoot):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunbenchmark">trunk/Tools/Scripts/run-benchmark</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_browser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_safari_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_server_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerutilspy">trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerrun_benchmarkpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185731 => 185732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/ChangeLog 2015-06-19 02:32:40 UTC (rev 185732)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-06-18 Dewei Zhu <dewei_zhu@apple.com>
+
+ Extend capability of run-benchmark script to support mobile device
+ https://bugs.webkit.org/show_bug.cgi?id=146125
+
+ Reviewed by Ryosuke Niwa.
+
+ Extend capability of run-benchmark to support mobile device, and move majority of run-benchmark script code to
+ benchmark_runner directory, and make run-benchmark a wrapping script. Also correct a typo.
+
+ * Scripts/run-benchmark:
+ (main): Deleted.
+ * Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
+ (BenchmarkRunner.__init__):
+ (BenchmarkRunner.execute):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
+ (BrowserDriver.prepareEnv):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
+ (OSXBrowserDriver.prepareEnv):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+ (OSXSafariDriver.prepareEnv):
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py:
+ (HTTPServerDriver.getReturnCode):
+ (HTTPServerDriver):
+ (HTTPServerDriver.setDeviceID):
+ * Scripts/webkitpy/benchmark_runner/run_benchmark.py: Copied from Tools/Scripts/run-benchmark.
+ (parse_args):
+ (start):
+ (main):
+ * Scripts/webkitpy/benchmark_runner/utils.py:
+ (getPathFromProjectRoot):
+
</ins><span class="cx"> 2015-06-18 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Add Matt Daiter as a contributor.
</span></span></pre></div>
<a id="trunkToolsScriptsrunbenchmark"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-benchmark (185731 => 185732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-benchmark 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/run-benchmark 2015-06-19 02:32:40 UTC (rev 185732)
</span><span class="lines">@@ -1,44 +1,13 @@
</span><span class="cx"> #!/usr/bin/env python
</span><span class="cx">
</span><del>-import argparse
</del><span class="cx"> import logging
</span><del>-import platform
</del><span class="cx"> import sys
</span><span class="cx">
</span><del>-from webkitpy.benchmark_runner.benchmark_runner import BenchmarkRunner
-from webkitpy.benchmark_runner.browser_driver.browser_driver_factory import BrowserDriverFactory
</del><ins>+from webkitpy.benchmark_runner.run_benchmark import main, format_logger
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> _log = logging.getLogger()
</span><del>-_log.setLevel(logging.INFO)
-ch = logging.StreamHandler()
-formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
-ch.setFormatter(formatter)
-_log.addHandler(ch)
</del><span class="cx">
</span><del>-
-def main():
- parser = argparse.ArgumentParser(description='Automate the browser based performance benchmarks')
- parser.add_argument('--output-file', dest='output', default=None)
- parser.add_argument('--build-directory', dest='buildDir', help='Path to the browser executable. e.g. WebKitBuild/Release/')
- parser.add_argument('--plan', dest='plan', required=True, help='Benchmark plan to run. e.g. speedometer, jetstream')
- parser.add_argument('--platform', dest='platform', required=True, choices=BrowserDriverFactory.available_platforms())
- # FIXME: Should we add chrome as an option? Well, chrome uses webkit in iOS.
- parser.add_argument('--browser', dest='browser', required=True, choices=BrowserDriverFactory.available_browsers())
- parser.add_argument('--debug', action='store_true')
- parser.add_argument('--local-copy', dest='localCopy', help='Path to a local copy of the benchmark. e.g. PerformanceTests/SunSpider/')
- parser.add_argument('--count', dest='countOverride', type=int, help='Number of times to run the benchmark. e.g. 5')
- args = parser.parse_args()
-
- if args.debug:
- _log.setLevel(logging.DEBUG)
- _log.debug('Initializing program with following parameters')
- _log.debug('\toutput file name\t: %s' % args.output)
- _log.debug('\tbuild directory\t: %s' % args.buildDir)
- _log.debug('\tplan name\t: %s', args.plan)
- runner = BenchmarkRunner(args.plan, args.localCopy, args.countOverride, args.buildDir, args.output, args.platform, args.browser)
- runner.execute()
-
-
</del><span class="cx"> if __name__ == '__main__':
</span><ins>+ format_logger(_log)
</ins><span class="cx"> sys.exit(main())
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py (185731 => 185732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-06-19 02:32:40 UTC (rev 185732)
</span><span class="lines">@@ -25,8 +25,7 @@
</span><span class="cx">
</span><span class="cx"> class BenchmarkRunner(object):
</span><span class="cx">
</span><del>- def __init__(self, planFile, localCopy, countOverride, buildDir, outputFile, platform, browser):
- _log.info('Initializing benchmark running')
</del><ins>+ def __init__(self, planFile, localCopy, countOverride, buildDir, outputFile, platform, browser, httpServerDriverOverride=None, deviceID=None):
</ins><span class="cx"> try:
</span><span class="cx"> planFile = self._findPlanFile(planFile)
</span><span class="cx"> with open(planFile, 'r') as fp:
</span><span class="lines">@@ -36,10 +35,14 @@
</span><span class="cx"> self.plan['local_copy'] = localCopy
</span><span class="cx"> if countOverride:
</span><span class="cx"> self.plan['count'] = countOverride
</span><ins>+ if httpServerDriverOverride:
+ self.plan['http_server_driver'] = httpServerDriverOverride
</ins><span class="cx"> self.browserDriver = BrowserDriverFactory.create([platform, browser])
</span><span class="cx"> self.httpServerDriver = HTTPServerDriverFactory.create([self.plan['http_server_driver']])
</span><ins>+ self.httpServerDriver.setDeviceID(deviceID)
</ins><span class="cx"> self.buildDir = os.path.abspath(buildDir) if buildDir else None
</span><span class="cx"> self.outputFile = outputFile
</span><ins>+ self.deviceID = deviceID
</ins><span class="cx"> except IOError as error:
</span><span class="cx"> _log.error('Can not open plan file: %s - Error %s' % (planFile, error))
</span><span class="cx"> raise error
</span><span class="lines">@@ -68,7 +71,7 @@
</span><span class="cx"> for x in xrange(int(self.plan['count'])):
</span><span class="cx"> _log.info('Start the iteration %d of current benchmark' % (x + 1))
</span><span class="cx"> self.httpServerDriver.serve(webRoot)
</span><del>- self.browserDriver.prepareEnv()
</del><ins>+ self.browserDriver.prepareEnv(self.deviceID)
</ins><span class="cx"> url = urlparse.urljoin(self.httpServerDriver.baseUrl(), self.planName + '/' + self.plan['entry_point'])
</span><span class="cx"> self.browserDriver.launchUrl(url, self.buildDir)
</span><span class="cx"> result = None
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py (185731 => 185732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2015-06-19 02:32:40 UTC (rev 185732)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> class BrowserDriver(object):
</span><span class="cx">
</span><span class="cx"> @abc.abstractmethod
</span><del>- def prepareEnv(self):
</del><ins>+ def prepareEnv(self, deviceID):
</ins><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> @abc.abstractmethod
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_browser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py (185731 => 185732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2015-06-19 02:32:40 UTC (rev 185732)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> class OSXBrowserDriver(BrowserDriver):
</span><span class="cx"> bundleIdentifier = None
</span><span class="cx">
</span><del>- def prepareEnv(self):
</del><ins>+ def prepareEnv(self, deviceID):
</ins><span class="cx"> self.closeBrowsers()
</span><span class="cx"> CGWarpMouseCursorPosition((10, 0))
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_safari_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (185731 => 185732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-06-19 02:32:40 UTC (rev 185732)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> class OSXSafariDriver(OSXBrowserDriver):
</span><span class="cx"> bundleIdentifier = 'com.apple.Safari'
</span><span class="cx">
</span><del>- def prepareEnv(self):
</del><ins>+ def prepareEnv(self, deviceID):
</ins><span class="cx"> self.safariProcess = None
</span><span class="cx"> super(OSXSafariDriver, self).prepareEnv()
</span><span class="cx"> forceRemove(os.path.join(os.path.expanduser('~'), 'Library/Saved Application State/com.apple.Safari.savedState'))
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_server_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py (185731 => 185732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py 2015-06-19 02:32:40 UTC (rev 185732)
</span><span class="lines">@@ -19,3 +19,7 @@
</span><span class="cx"> @abstractmethod
</span><span class="cx"> def getReturnCode(self):
</span><span class="cx"> pass
</span><ins>+
+ @abstractmethod
+ def setDeviceID(self, deviceID):
+ pass
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerrun_benchmarkpyfromrev185731trunkToolsScriptsrunbenchmark"></a>
<div class="copfile"><h4>Copied: trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py (from rev 185731, trunk/Tools/Scripts/run-benchmark) (0 => 185732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py 2015-06-19 02:32:40 UTC (rev 185732)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+#!/usr/bin/env python
+
+import argparse
+import logging
+import platform
+import os
+
+from benchmark_runner import BenchmarkRunner
+from browser_driver.browser_driver_factory import BrowserDriverFactory
+
+
+_log = logging.getLogger(__name__)
+
+
+def parse_args():
+ parser = argparse.ArgumentParser(description='Automate the browser based performance benchmarks')
+ parser.add_argument('--output-file', dest='output', default=None)
+ parser.add_argument('--build-directory', dest='buildDir', help='Path to the browser executable. e.g. WebKitBuild/Release/')
+ parser.add_argument('--plan', dest='plan', required=True, help='Benchmark plan to run. e.g. speedometer, jetstream')
+ parser.add_argument('--platform', dest='platform', required=True, choices=BrowserDriverFactory.available_platforms())
+ # FIXME: Should we add chrome as an option? Well, chrome uses webkit in iOS.
+ parser.add_argument('--browser', dest='browser', required=True, choices=BrowserDriverFactory.available_browsers())
+ parser.add_argument('--debug', action='store_true')
+ parser.add_argument('--local-copy', dest='localCopy', help='Path to a local copy of the benchmark. e.g. PerformanceTests/SunSpider/')
+ parser.add_argument('--count', dest='countOverride', type=int, help='Number of times to run the benchmark. e.g. 5')
+ parser.add_argument('--http-server-driver', dest='httpServerDriverOverride', default=None, help='Specify which HTTP server you wants to use')
+ parser.add_argument('--device-id', dest='device_id', default=None)
+
+ args = parser.parse_args()
+
+ if args.debug:
+ _log.setLevel(logging.DEBUG)
+ _log.debug('Initializing program with following parameters')
+ _log.debug('\toutput file name\t: %s' % args.output)
+ _log.debug('\tbuild directory\t: %s' % args.buildDir)
+ _log.debug('\tplan name\t: %s', args.plan)
+
+ return args
+
+
+def start(args):
+ runner = BenchmarkRunner(args.plan, args.localCopy, args.countOverride, args.buildDir, args.output, args.platform, args.browser, args.httpServerDriverOverride, args.device_id)
+ runner.execute()
+
+
+def format_logger(logger):
+ logger.setLevel(logging.INFO)
+ ch = logging.StreamHandler()
+ formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+ ch.setFormatter(formatter)
+ logger.addHandler(ch)
+
+
+def main():
+ start(parse_args())
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerutilspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py (185731 => 185732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py 2015-06-19 01:13:37 UTC (rev 185731)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py 2015-06-19 02:32:40 UTC (rev 185732)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def getPathFromProjectRoot(relativePathToProjectRoot):
</span><del>- # Choose the directory containning current file as start point,
</del><ins>+ # Choose the directory containing current file as start point,
</ins><span class="cx"> # compute relative path base on the parameter,
</span><span class="cx"> # and return an absolute path
</span><span class="cx"> return os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), relativePathToProjectRoot))
</span></span></pre>
</div>
</div>
</body>
</html>