diff options
Diffstat (limited to 'chromium/tools/gypv8sh.py')
| -rwxr-xr-x | chromium/tools/gypv8sh.py | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/chromium/tools/gypv8sh.py b/chromium/tools/gypv8sh.py index 918368cbbfc..b8bd4066ec2 100755 --- a/chromium/tools/gypv8sh.py +++ b/chromium/tools/gypv8sh.py @@ -5,10 +5,6 @@ """This script is used by chrome_tests.gypi's js2webui action to maintain the argument lists and to generate inlinable tests. - -Usage: - python tools/gypv8sh.py v8_shell mock.js test_api.js js2webui.js \ - inputfile inputrelfile cxxoutfile jsoutfile """ import json @@ -22,20 +18,28 @@ import shutil def main (): parser = optparse.OptionParser() parser.set_usage( - "%prog v8_shell mock.js axs_testing.js test_api.js js2webui.js " + "%prog v8_shell mock.js test_api.js js2webui.js " "testtype inputfile inputrelfile cxxoutfile jsoutfile") parser.add_option('-v', '--verbose', action='store_true') parser.add_option('-n', '--impotent', action='store_true', help="don't execute; just print (as if verbose)") + parser.add_option('--deps_js', action="store", + help=("Path to deps.js for dependency resolution, " + + "optional.")) (opts, args) = parser.parse_args() - if len(args) != 10: + if len(args) != 9: parser.error('all arguments are required.') - (v8_shell, mock_js, axs_testing_js, test_api, js2webui, test_type, + (v8_shell, mock_js, test_api, js2webui, test_type, inputfile, inputrelfile, cxxoutfile, jsoutfile) = args - arguments = [js2webui, inputfile, inputrelfile, cxxoutfile, test_type] - cmd = [v8_shell, '-e', "arguments=" + json.dumps(arguments), mock_js, - axs_testing_js, test_api, js2webui] + cmd = [v8_shell] + icudatafile = os.path.join(os.path.dirname(v8_shell), 'icudtl.dat') + if os.path.exists(icudatafile): + cmd.extend(['--icu-data-file=%s' % icudatafile]) + arguments = [js2webui, inputfile, inputrelfile, opts.deps_js, + cxxoutfile, test_type] + cmd.extend(['-e', "arguments=" + json.dumps(arguments), mock_js, + test_api, js2webui]) if opts.verbose or opts.impotent: print cmd if not opts.impotent: @@ -45,6 +49,8 @@ def main (): shutil.copyfile(inputfile, jsoutfile) except Exception, ex: if os.path.exists(cxxoutfile): + # The contents of the output file will include the error message. + print open(cxxoutfile).read() os.remove(cxxoutfile) if os.path.exists(jsoutfile): os.remove(jsoutfile) |