Changeset 129683 in webkit

Timestamp:

Sep 26, 2012 12:20:37 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

run-perf-tests must expand environment variables in user provided paths
​https://bugs.webkit.org/show_bug.cgi?id=97686

Patch by Marcelo Lira <​marcelo.lira@openbossa.org> on 2012-09-26
Reviewed by Ryosuke Niwa.

The run-perf-tests command line options that receive paths from the
user now expand any possible environment variables, because Python's
file handling methods do not handle those.

Examples:
run-perf-tests --platform=qt --release --output-json-path=~/perf-results
run-perf-tests --platform=qt --release --output-json-path=$HOME/perf-results

Also removed unused imports.

• Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner._parse_args._expand_path): expand environment variables in a path passed via command line
(PerfTestsRunner._parse_args):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftestsrunner.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-26  Marcelo Lira  <marcelo.lira@openbossa.org>
+
+        run-perf-tests must expand environment variables in user provided paths
+        https://bugs.webkit.org/show_bug.cgi?id=97686
+
+        Reviewed by Ryosuke Niwa.
+
+        The run-perf-tests command line options that receive paths from the
+        user now expand any possible environment variables, because Python's
+        file handling methods do not handle those.
+
+        Examples:
+        run-perf-tests --platform=qt --release --output-json-path=~/perf-results
+        run-perf-tests --platform=qt --release --output-json-path=$HOME/perf-results
+
+        Also removed unused imports.
+
+        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+        (PerfTestsRunner._parse_args._expand_path): expand environment variables in a path passed via command line
+        (PerfTestsRunner._parse_args):
+
 2012-09-26  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

@@ -30 +30 @@
 """Run Inspector's perf tests in perf mode."""
 
+import os
 import json
 import logging
 import optparse
-import re
-import sys
 import time
 
@@ -40 +39 @@
 from webkitpy.common.host import Host
 from webkitpy.common.net.file_uploader import FileUploader
-from webkitpy.layout_tests.views import printing
 from webkitpy.performance_tests.perftest import PerfTestFactory
-from webkitpy.performance_tests.perftest import ReplayPerfTest
 
 
@@ -74 +71 @@
     @staticmethod
     def _parse_args(args=None):
+        def _expand_path(option, opt_str, value, parser):
+            path = os.path.expandvars(os.path.expanduser(value))
+            setattr(parser.values, option.dest, path)
         perf_option_list = [
             optparse.make_option('--debug', action='store_const', const='Debug', dest="configuration",
@@ -99 +99 @@
             optparse.make_option("--no-results", action="store_false", dest="generate_results", default=True,
                 help="Do no generate results JSON and results page."),
-            optparse.make_option("--output-json-path",
+            optparse.make_option("--output-json-path", action='callback', callback=_expand_path, type="str",
                 help="Path to generate a JSON file at; may contain previous results if it already exists."),
             optparse.make_option("--reset-results", action="store_true",
                 help="Clears the content in the generated JSON file before adding the results."),
-            optparse.make_option("--slave-config-json-path",
+            optparse.make_option("--slave-config-json-path", action='callback', callback=_expand_path, type="str",
                 help="Only used on bots. Path to a slave configuration file."),
-            optparse.make_option("--source-json-path", dest="slave_config_json_path",
+            optparse.make_option("--source-json-path", action='callback', callback=_expand_path, type="str", dest="slave_config_json_path",
                 # FIXME: Remove this option once build.webkit.org is updated to use --slave-config-json-path.
                 help="Deprecated. Overrides --slave-config-json-path."),