Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Side by Side Diff: chrome/common/extensions/docs/build/build.py

Issue 10834048: Fix build.py by removing timeout of DumpRenderTree (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """Docbuilder for extension docs.""" 6 """Docbuilder for extension docs."""
7 7
8 import glob 8 import glob
9 import os 9 import os
10 import os.path 10 import os.path
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 originals[name] = open(input_file, 'rb').read() 73 originals[name] = open(input_file, 'rb').read()
74 os.remove(input_file) 74 os.remove(input_file)
75 else: 75 else:
76 originals[name] = "" 76 originals[name] = ""
77 77
78 shutil.copy(_page_shell_html, input_file) 78 shutil.copy(_page_shell_html, input_file)
79 79
80 print generator_url 80 print generator_url
81 81
82 # Run DumpRenderTree and capture result 82 # Run DumpRenderTree and capture result
83 p = Popen([dump_render_tree, generator_url], stdout=PIPE) 83 p = Popen([dump_render_tree, "--no-timeout", generator_url], stdout=PIPE)
84 84
85 # The remaining output will be the content of the generated pages. 85 # The remaining output will be the content of the generated pages.
86 output = p.stdout.read() 86 output = p.stdout.read()
87 87
88 # Parse out just the JSON part. 88 # Parse out just the JSON part.
89 begin = output.find(_expected_output_preamble) 89 begin = output.find(_expected_output_preamble)
90 end = output.rfind(_expected_output_postamble) 90 end = output.rfind(_expected_output_postamble)
91 91
92 if (begin < 0 or end < 0): 92 if (begin < 0 or end < 0):
93 raise Exception("%s returned invalid output:\n\n%s" % 93 raise Exception("%s returned invalid output:\n\n%s" %
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 # Cleanup our temporary IDL->JSON files 232 # Cleanup our temporary IDL->JSON files
233 api_manifest.cleanupGeneratedFiles() 233 api_manifest.cleanupGeneratedFiles()
234 234
235 if 'EX_OK' in dir(os): 235 if 'EX_OK' in dir(os):
236 return os.EX_OK 236 return os.EX_OK
237 else: 237 else:
238 return 0 238 return 0
239 239
240 if __name__ == '__main__': 240 if __name__ == '__main__':
241 sys.exit(main()) 241 sys.exit(main())
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698