diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 00:46:08 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 00:46:08 +0000 |
| commit | 7cf364b0293faca34e3384eef3aeda6e53df8038 (patch) | |
| tree | b9c856bc46b0a61f8d6d2f00043c08c5ea881d3a /chrome/common/extensions/docs/build | |
| parent | 2c9bf9d7fc00e4d3a2b3655300156424127d4fc6 (diff) | |
| download | chromium_src-7cf364b0293faca34e3384eef3aeda6e53df8038.zip chromium_src-7cf364b0293faca34e3384eef3aeda6e53df8038.tar.gz chromium_src-7cf364b0293faca34e3384eef3aeda6e53df8038.tar.bz2 | |
Buff out Windows & Tabs API, fix a few doc bugs.
This adds callback types, event types, and descriptions for the tabs & windows api.
All defined types are loaded first in preparing the template data, so that types can cross reference across apis.
Also, additional commentary is added to content_scripts.html doc about communication with the embedding page of a content_script.
A check is now made in build.py for the case of the doc page rendering timing out (which is typically a clue that page rendering went wrong and should be inspected with chrome).
Review URL: http://codereview.chromium.org/165063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/docs/build')
| -rwxr-xr-x | chrome/common/extensions/docs/build/build.bat | 7 | ||||
| -rwxr-xr-x | chrome/common/extensions/docs/build/build.py | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/chrome/common/extensions/docs/build/build.bat b/chrome/common/extensions/docs/build/build.bat new file mode 100755 index 0000000..fd81d47 --- /dev/null +++ b/chrome/common/extensions/docs/build/build.bat @@ -0,0 +1,7 @@ +@echo off + +:: Runs the win32 python interpreter checked into third_party\python_24 on +:: windows. cygwin python will not work because it will path /cygdrive/... +:: paths to test_shell. + +..\..\..\..\..\third_party\python_24\python.exe build.py
\ No newline at end of file diff --git a/chrome/common/extensions/docs/build/build.py b/chrome/common/extensions/docs/build/build.py index be822f9..de2c891 100755 --- a/chrome/common/extensions/docs/build/build.py +++ b/chrome/common/extensions/docs/build/build.py @@ -59,7 +59,7 @@ def RenderPage(name, test_shell): stdout=PIPE) # first output line is url that was processed by test_shell - p.stdout.readline() + firstline = p.stdout.readline() # second output line is the layoutTestShell.dumpText() value. result = p.stdout.readline() @@ -68,8 +68,14 @@ def RenderPage(name, test_shell): os.remove(input_file) if (not result.startswith(_expected_output_preamble)): - if (original): - open(input_file).write(original); + if (firstline.startswith("#TEST_TIMED_OUT")): + raise Exception("test_shell returned TEST_TIMED_OUT.\n" + + "Their was probably a problem with generating the " + + "page\n" + + "Try copying template/page_shell.html to:\n" + + input_file + + "\nAnd open it in chrome using the file: scheme.\n" + + "Look from javascript errors via the inspector.") raise Exception("test_shell returned unexpected output: " + result); # Write output |