25880 2009-05-19 18:48:32 -0700 js tests should move into jstests subdirectory instead of resources/ 2009-09-22 17:16:47 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned commit-queue darin ggaren hamaji ojan wsiegrist oldest_to_newest 122000 0 eric 2009-05-19 18:48:32 -0700 js tests should move into jstests subdirectory instead of resources/ This would get rid of make-js-test-wrappers exclude list. It would also make it possible to add a "fallback" TEMPLATE.html which could be used, since TEMPLATE.html no longer serves as an indicator for "crawl this directory and make .js files into tests". 122001 1 eric 2009-05-19 18:49:39 -0700 A "fallback" template would mean that to add a js test you no longer have to copy TEMPLATE.html into resources and fix it up, instead you just add a jstests subdirectory and add your test there. :) 122056 2 darin 2009-05-19 21:54:55 -0700 All of this sounds good to me except for the name "jstests". I think we can do better. 138944 3 hamaji 2009-08-11 05:55:52 -0700 I'd like to help this! Before I actually start, I'd like to check if I understand the requirements correctly. I think the first step of this bug is moving all resources/*.js files which aren't excluded by the list in make-js-test-wrappers into somewhere, fix all layout tests so that they reference the new location, and make-js-test-wrappers look the destination directory. Am I understanding correctly? Also, I'd like to know the better name for them. Maybe "js" or "scripts" ? 139019 4 darin 2009-08-11 10:20:12 -0700 (In reply to comment #3) > I think the first step of this bug is moving all resources/*.js files which > aren't excluded by the list in make-js-test-wrappers into somewhere, fix all > layout tests so that they reference the new location, and make-js-test-wrappers > look the destination directory. Am I understanding correctly? > > Also, I'd like to know the better name for them. Maybe "js" or "scripts" ? I think "scripts" is not a good name, because the whole point is that these are "script tests", not just scripts. Maybe "jstests" is OK, or "js-tests" or "script-tests". The way I'd do it is: 1) Change make-js-test-wrappers to work for tests in directories either named "resources" or the new name. 2) Move one test with "svn mv". Run make-js-test-wrappers. Check in the new top level .html file and the test in the new location. 3) If everything went well after (2), then repeat (2) for all other tests. As you say above, all the resources/*.js files that are not in the excluded list. 4) Remove the support for directories named "resources" in make-js-test-wrappers and remove the exception list as well. 139023 5 eric 2009-08-11 10:23:39 -0700 Obviously step 2 can be scripted once it's tested. :) 139024 6 eric 2009-08-11 10:24:15 -0700 I vote for "script-tests" as the name. 139025 7 eric 2009-08-11 10:25:02 -0700 (Although eventually we'll want to rename make-js-test-wrappers if we use "script-tests".) Thanks again for looking at this! 139039 8 darin 2009-08-11 10:53:44 -0700 (In reply to comment #7) > (Although eventually we'll want to rename make-js-test-wrappers if we use > "script-tests".) Thanks again for looking at this! I think we could rename make-js-test-wrappers to make-script-tests-wrappers right away as step (0). I also think that eventually we could teach run-webkit-tests to run these tests without checking in wrappers. But that would have a downside since it would be harder to open one of these tests directly from a browser. Further, I think that in the future we might want to run some of these tests as pure JavaScript tests, using the "jsc" command line tool instead of "DumpRenderTree" -- some can't work that way but others can't, and I wonder how we could distinguish those. Finally, I'd love to convert the Mozilla tests for JavaScript in the JavaScriptCore tree into these style tests so they all run with run-webkit-tests. Not all relevant to this task, but since you asked I thought I'd talk a bit about more of the road map in my mind. 139040 9 darin 2009-08-11 10:54:04 -0700 (In reply to comment #8) > (In reply to comment #7) > > (Although eventually we'll want to rename make-js-test-wrappers if we use > > "script-tests".) Thanks again for looking at this! > > I think we could rename make-js-test-wrappers to make-script-tests-wrappers > right away as step (0). make-script-test-wrappers -- an "s" crept in there 139248 10 hamaji 2009-08-11 22:41:18 -0700 Filed Bug 28212 as the step 0. 139254 11 hamaji 2009-08-11 22:48:17 -0700 Thanks for the detailed comments on this task and future road maps! The steps Darin suggest sounds definitely better than my "change at once" plan. I'd like to follow the steps. The future road maps also sound nice. I'll be happy if I can help any of them. By the way, I've noticed that running make-js-test-wrappers change 4 HTMLs which are slightly modified from the original TEMPLATE. I think we need to fix this before the step 1. I'll send a patch soon later. I hope my change makes sense. 139259 12 eric 2009-08-11 22:56:33 -0700 Yes, it's common the .js files get added to resources/ and not ignored in make-js-test-wrappers. That's why we're doing this! To make that problem go away. Once we have a separate directory for the script-tests then we won't need this silly ignore list. So yes, please feel encouraged to add those 4 files to the ignore list. You have my rubber-stamp already and do no need to post such a change for review. I might also add that further in my personal roadmap would be moving all of the js-test-pre.js stuff out of fast/js/resources and into a LayoutTests/script-tests-harness directory, or some other nicely-named top-level directory where we can put more of this testing framework in an easily accessible place. I would also like to add more support to make-js-test-wrappers, including some sort of template system. So that either via a comment in the script-test/my-test.js file or via a an otherwise-ignored template("name.html") call, that we can have custom templates on a per-file basis. 142789 13 38599 hamaji 2009-08-25 22:47:30 -0700 Created attachment 38599 Patch v1 142791 14 hamaji 2009-08-25 22:50:57 -0700 Now I've got committer bit! Good time to restart this work as now I can svn mv by myself. 144132 15 38599 eric 2009-09-02 00:40:56 -0700 Comment on attachment 38599 Patch v1 Looks fine. I look forward to seeing the script to do the big move! :) The commit-queue should handle the moves just fine, but since Shinichiro is now a committer, maybe he wants to commit this himself. he can always set cq+ if he'd prefer the bot to commit it for him. 144133 16 38599 hamaji 2009-09-02 00:44:52 -0700 Comment on attachment 38599 Patch v1 Thanks for the review, Eric. OK, I'd try commit-queue+. It's a bit tricky for me to access my machine as I'm out of office now. 144139 17 38599 eric 2009-09-02 00:52:28 -0700 Comment on attachment 38599 Patch v1 It seems you haven't yet used your new-found committer powers to add yourself to WebKitTools/Scripts/modules/committers.py yet. You'll need to do that before the commit-queue accepts your patches. Exception: Unknown committer: hamaji@chromium.org 144142 18 38599 eric 2009-09-02 01:08:31 -0700 Comment on attachment 38599 Patch v1 Clearing flags on attachment: 38599 Committed r47956: <http://trac.webkit.org/changeset/47956> 144143 19 eric 2009-09-02 01:08:35 -0700 All reviewed patches have been landed. Closing bug. 146116 20 hamaji 2009-09-10 01:28:33 -0700 Need more patch to complete this work. 146121 21 39329 hamaji 2009-09-10 01:36:04 -0700 Created attachment 39329 A huge migration done by script 146126 22 39331 hamaji 2009-09-10 01:41:35 -0700 Created attachment 39331 script for the above patch The above patch is created by this script. I'm not sure if this script should be committed. This script is only for this one attempt. This script invokes make-script-test-wrappers script, knows which html is generated using standard output, and moves the modified files into the new directory. I made make-script-wrappers ignore the following files before I ran this script. They are newly modified/added and they don't agree with their TEMPLATE. getOwnPropertyDescriptor.js Geolocation/resources/*.js resources/message-port-multi.js I'd like to fix them after this migration. As Geolocation requires gtk port, it would take some time. As for the huge patch, I think it makes few sense to have 1800 lines of ChangeLog. Is it OK to remove them? If OK, should I write instead of these lines? 147684 23 39329 eric 2009-09-16 17:16:48 -0700 Comment on attachment 39329 A huge migration done by script Please announce this change for 24 hours on webkit-dev before committing. Rubber stamp = me. 148484 24 39817 hamaji 2009-09-19 03:41:24 -0700 Created attachment 39817 last migration patch I couldn't commit Though I committed patches for the most of layout tests directories, I couldn't commit this patch which moves the tests in LayoutTests/fast/js. 148881 25 39817 hamaji 2009-09-21 16:02:25 -0700 Comment on attachment 39817 last migration patch I couldn't commit Still I cannot commit this... Asking review+ as I'd like to try commit-queue+ to commit this patch. 148920 26 39817 eric 2009-09-21 18:00:04 -0700 Comment on attachment 39817 last migration patch I couldn't commit The ChangeLog diff might confuse svn-apply, so I'd rather not send this exact patch though the queue. 148952 27 39904 hamaji 2009-09-21 22:06:39 -0700 Created attachment 39904 last migration patch changelog fixed Oops. Fixed the ChangeLog diff. 148955 28 39904 eric 2009-09-21 22:12:48 -0700 Comment on attachment 39904 last migration patch changelog fixed OK. Per your request: I'm happy to try the commit-queue. I don't know why it would have more luck than you did, but we'll see. 148959 29 39904 commit-queue 2009-09-21 22:24:33 -0700 Comment on attachment 39904 last migration patch changelog fixed Rejecting patch 39904 from commit-queue. Failed to run "['git', 'svn', 'dcommit']" exit_code: 1 Committing to http://svn.webkit.org/repository/webkit/trunk ... R LayoutTests/fast/js/kde/resources/Array.js => LayoutTests/fast/js/kde/script-tests/Array.js R LayoutTests/fast/js/kde/resources/Boolean.js => LayoutTests/fast/js/kde/script-tests/Boolean.js R LayoutTests/fast/js/kde/resources/TEMPLATE-n.html => LayoutTests/fast/js/kde/script-tests/TEMPLATE-n.html R LayoutTests/fast/js/kde/resources/TEMPLATE.html => LayoutTests/fast/js/kde/script-tests/TEMPLATE.html R LayoutTests/fast/js/kde/resources/arguments-scope.js => LayoutTests/fast/js/kde/script-tests/arguments-scope.js R LayoutTests/fast/js/kde/resources/assignments.js => LayoutTests/fast/js/kde/script-tests/assignments.js R LayoutTests/fast/js/kde/resources/cast.js => LayoutTests/fast/js/kde/script-tests/cast.js R LayoutTests/fast/js/kde/resources/comment-1.js => LayoutTests/fast/js/kde/script-tests/comment-1.js R LayoutTests/fast/js/kde/resources/comment-2.js => LayoutTests/fast/js/kde/script-tests/comment-2.js R LayoutTests/fast/js/kde/resources/completion.js => LayoutTests/fast/js/kde/script-tests/completion.js R LayoutTests/fast/js/kde/resources/conditional.js => LayoutTests/fast/js/kde/script-tests/conditional.js R LayoutTests/fast/js/kde/resources/constructor_length.js => LayoutTests/fast/js/kde/script-tests/constructor_length.js R LayoutTests/fast/js/kde/resources/crash-1.js => LayoutTests/fast/js/kde/script-tests/crash-1.js R LayoutTests/fast/js/kde/resources/crash-2.js => LayoutTests/fast/js/kde/script-tests/crash-2.js R LayoutTests/fast/js/kde/resources/delete.js => LayoutTests/fast/js/kde/script-tests/delete.js R LayoutTests/fast/js/resources/Array-isArray.js => LayoutTests/fast/js/script-tests/Array-isArray.js R LayoutTests/fast/js/resources/TEMPLATE.html => LayoutTests/fast/js/script-tests/TEMPLATE.html R LayoutTests/fast/js/resources/activation-proto.js => LayoutTests/fast/js/script-tests/activation-proto.js R LayoutTests/fast/js/resources/arguments-bad-index.js => LayoutTests/fast/js/script-tests/arguments-bad-index.js R LayoutTests/fast/js/resources/arguments.js => LayoutTests/fast/js/script-tests/arguments.js R LayoutTests/fast/js/resources/array-enumerators-functions.js => LayoutTests/fast/js/script-tests/array-enumerators-functions.js R LayoutTests/fast/js/resources/array-every.js => LayoutTests/fast/js/script-tests/array-every.js R LayoutTests/fast/js/resources/array-filter.js => LayoutTests/fast/js/script-tests/array-filter.js R LayoutTests/fast/js/resources/array-float-delete.js => LayoutTests/fast/js/script-tests/array-float-delete.js R LayoutTests/fast/js/resources/array-functions-non-arrays.js => LayoutTests/fast/js/script-tests/array-functions-non-arrays.js R LayoutTests/fast/js/resources/array-holes.js => LayoutTests/fast/js/script-tests/array-holes.js R LayoutTests/fast/js/resources/array-index-immediate-types.js => LayoutTests/fast/js/script-tests/array-index-immediate-types.js R LayoutTests/fast/js/resources/array-indexing.js => LayoutTests/fast/js/script-tests/array-indexing.js R LayoutTests/fast/js/resources/array-iterate-backwards.js => LayoutTests/fast/js/script-tests/array-iterate-backwards.js R LayoutTests/fast/js/resources/array-join-bug-11524.js => LayoutTests/fast/js/script-tests/array-join-bug-11524.js R LayoutTests/fast/js/resources/array-lastIndexOf.js => LayoutTests/fast/js/script-tests/array-lastIndexOf.js R LayoutTests/fast/js/resources/array-reduce.js => LayoutTests/fast/js/script-tests/array-reduce.js R LayoutTests/fast/js/resources/array-reduceRight.js => LayoutTests/fast/js/script-tests/array-reduceRight.js R LayoutTests/fast/js/resources/array-reset-large-index.js => LayoutTests/fast/js/script-tests/array-reset-large-index.js R LayoutTests/fast/js/resources/array-sort-reentrance.js => LayoutTests/fast/js/script-tests/array-sort-reentrance.js R LayoutTests/fast/js/resources/array-splice.js => LayoutTests/fast/js/script-tests/array-splice.js R LayoutTests/fast/js/resources/array-tostring-and-join.js => LayoutTests/fast/js/script-tests/array-tostring-and-join.js R LayoutTests/fast/js/resources/array-tostring-ignore-separator.js => LayoutTests/fast/js/script-tests/array-tostring-ignore-separator.js R LayoutTests/fast/js/resources/assign.js => LayoutTests/fast/js/script-tests/assign.js R LayoutTests/fast/js/resources/avl-crash.js => LayoutTests/fast/js/script-tests/avl-crash.js R LayoutTests/fast/js/resources/cached-eval-gc.js => LayoutTests/fast/js/script-tests/cached-eval-gc.js R LayoutTests/fast/js/resources/caller-property.js => LayoutTests/fast/js/script-tests/caller-property.js R LayoutTests/fast/js/resources/char-at.js => LayoutTests/fast/js/script-tests/char-at.js R LayoutTests/fast/js/resources/closure-inside-extra-arg-call.js => LayoutTests/fast/js/script-tests/closure-inside-extra-arg-call.js R LayoutTests/fast/js/resources/code-serialize-paren.js => LayoutTests/fast/js/script-tests/code-serialize-paren.js R LayoutTests/fast/js/resources/codegen-loops-logical-nodes.js => LayoutTests/fast/js/script-tests/codegen-loops-logical-nodes.js R LayoutTests/fast/js/resources/codegen-peephole-locals.js => LayoutTests/fast/js/script-tests/codegen-peephole-locals.js R LayoutTests/fast/js/resources/codegen-temporaries.js => LayoutTests/fast/js/script-tests/codegen-temporaries.js R LayoutTests/fast/js/resources/comparefn-sort-stability.js => LayoutTests/fast/js/script-tests/comparefn-sort-stability.js R LayoutTests/fast/js/resources/const-without-initializer.js => LayoutTests/fast/js/script-tests/const-without-initializer.js R LayoutTests/fast/js/resources/constant-count.js => LayoutTests/fast/js/script-tests/constant-count.js R LayoutTests/fast/js/resources/constant-folding.js => LayoutTests/fast/js/script-tests/constant-folding.js R LayoutTests/fast/js/resources/constructor-attributes.js => LayoutTests/fast/js/script-tests/constructor-attributes.js R LayoutTests/fast/js/resources/constructor.js => LayoutTests/fast/js/script-tests/constructor.js R LayoutTests/fast/js/resources/continue-break-multiple-labels.js => LayoutTests/fast/js/script-tests/continue-break-multiple-labels.js R LayoutTests/fast/js/resources/convert-nan-to-bool.js => LayoutTests/fast/js/script-tests/convert-nan-to-bool.js R LayoutTests/fast/js/resources/cyclic-proto.js => LayoutTests/fast/js/script-tests/cyclic-proto.js R LayoutTests/fast/js/resources/cyclic-prototypes.js => LayoutTests/fast/js/script-tests/cyclic-prototypes.js R LayoutTests/fast/js/resources/cyclic-ref-toString.js => LayoutTests/fast/js/script-tests/cyclic-ref-toString.js R LayoutTests/fast/js/resources/date-DST-pre-1970.js => LayoutTests/fast/js/script-tests/date-DST-pre-1970.js R LayoutTests/fast/js/resources/date-DST-time-cusps.js => LayoutTests/fast/js/script-tests/date-DST-time-cusps.js R LayoutTests/fast/js/resources/date-big-constructor.js => LayoutTests/fast/js/script-tests/date-big-constructor.js R LayoutTests/fast/js/resources/date-big-setdate.js => LayoutTests/fast/js/script-tests/date-big-setdate.js R LayoutTests/fast/js/resources/date-big-setmonth.js => LayoutTests/fast/js/script-tests/date-big-setmonth.js R LayoutTests/fast/js/resources/date-constructor.js => LayoutTests/fast/js/script-tests/date-constructor.js R LayoutTests/fast/js/resources/date-negative-setmonth.js => LayoutTests/fast/js/script-tests/date-negative-setmonth.js R LayoutTests/fast/js/resources/date-parse-comments-test.js => LayoutTests/fast/js/script-tests/date-parse-comments-test.js R LayoutTests/fast/js/resources/date-parse-test.js => LayoutTests/fast/js/script-tests/date-parse-test.js R LayoutTests/fast/js/resources/date-preserve-milliseconds.js => LayoutTests/fast/js/script-tests/date-preserve-milliseconds.js R LayoutTests/fast/js/resources/date-proto-generic-invocation.js => LayoutTests/fast/js/script-tests/date-proto-generic-invocation.js R LayoutTests/fast/js/resources/date-set-to-nan.js => LayoutTests/fast/js/script-tests/date-set-to-nan.js R LayoutTests/fast/js/resources/date-toisostring.js => LayoutTests/fast/js/script-tests/date-toisostring.js R LayoutTests/fast/js/resources/debugger.js => LayoutTests/fast/js/script-tests/debugger.js R LayoutTests/fast/js/resources/declaration-in-block.js => LayoutTests/fast/js/script-tests/declaration-in-block.js R LayoutTests/fast/js/resources/delete-getters-setters.js => LayoutTests/fast/js/script-tests/delete-getters-setters.js R LayoutTests/fast/js/resources/delete-syntax.js => LayoutTests/fast/js/script-tests/delete-syntax.js R LayoutTests/fast/js/resources/delete-then-put.js => LayoutTests/fast/js/script-tests/delete-then-put.js R LayoutTests/fast/js/resources/dictionary-no-cache.js => LayoutTests/fast/js/script-tests/dictionary-no-cache.js R LayoutTests/fast/js/resources/do-while-semicolon.js => LayoutTests/fast/js/script-tests/do-while-semicolon.js R LayoutTests/fast/js/resources/dot-node-base-exception.js => LayoutTests/fast/js/script-tests/dot-node-base-exception.js R LayoutTests/fast/js/resources/duplicate-param-crash.js => LayoutTests/fast/js/script-tests/duplicate-param-crash.js R LayoutTests/fast/js/resources/duplicate-param-gc-crash.js => LayoutTests/fast/js/script-tests/duplicate-param-gc-crash.js M LayoutTests/ChangeLog M LayoutTests/fast/js/Array-isArray.html M LayoutTests/fast/js/activation-proto.html M LayoutTests/fast/js/arguments-bad-index.html M LayoutTests/fast/js/arguments.html M LayoutTests/fast/js/array-enumerators-functions.html M LayoutTests/fast/js/array-every.html M LayoutTests/fast/js/array-filter.html M LayoutTests/fast/js/array-float-delete.html M LayoutTests/fast/js/array-functions-non-arrays.html M LayoutTests/fast/js/array-holes.html M LayoutTests/fast/js/array-index-immediate-types.html M LayoutTests/fast/js/array-indexing.html M LayoutTests/fast/js/array-iterate-backwards.html M LayoutTests/fast/js/array-join-bug-11524.html M LayoutTests/fast/js/array-lastIndexOf.html M LayoutTests/fast/js/array-reduce.html M LayoutTests/fast/js/array-reduceRight.html M LayoutTests/fast/js/array-reset-large-index.html M LayoutTests/fast/js/array-sort-reentrance.html M LayoutTests/fast/js/array-splice.html M LayoutTests/fast/js/array-tostring-and-join.html M LayoutTests/fast/js/array-tostring-ignore-separator.html M LayoutTests/fast/js/assign.html M LayoutTests/fast/js/avl-crash.html M LayoutTests/fast/js/cached-eval-gc.html M LayoutTests/fast/js/caller-property.html M LayoutTests/fast/js/char-at.html M LayoutTests/fast/js/closure-inside-extra-arg-call.html M LayoutTests/fast/js/code-serialize-paren.html M LayoutTests/fast/js/codegen-loops-logical-nodes.html M LayoutTests/fast/js/codegen-peephole-locals.html M LayoutTests/fast/js/codegen-temporaries.html M LayoutTests/fast/js/comparefn-sort-stability.html M LayoutTests/fast/js/const-without-initializer.html M LayoutTests/fast/js/constant-count.html M LayoutTests/fast/js/constant-folding.html M LayoutTests/fast/js/constructor-attributes.html M LayoutTests/fast/js/constructor.html M LayoutTests/fast/js/continue-break-multiple-labels.html M LayoutTests/fast/js/convert-nan-to-bool.html M LayoutTests/fast/js/cyclic-proto.html M LayoutTests/fast/js/cyclic-prototypes.html M LayoutTests/fast/js/cyclic-ref-toString.html M LayoutTests/fast/js/date-DST-pre-1970.html M LayoutTests/fast/js/date-DST-time-cusps.html M LayoutTests/fast/js/date-big-constructor.html M LayoutTests/fast/js/date-big-setdate.html M LayoutTests/fast/js/date-big-setmonth.html M LayoutTests/fast/js/date-constructor.html M LayoutTests/fast/js/date-negative-setmonth.html M LayoutTests/fast/js/date-parse-comments-test.html M LayoutTests/fast/js/date-parse-test.html M LayoutTests/fast/js/date-preserve-milliseconds.html M LayoutTests/fast/js/date-proto-generic-invocation.html M LayoutTests/fast/js/date-set-to-nan.html M LayoutTests/fast/js/date-toisostring.html M LayoutTests/fast/js/debugger.html M LayoutTests/fast/js/declaration-in-block.html M LayoutTests/fast/js/delete-getters-setters.html M LayoutTests/fast/js/delete-syntax.html M LayoutTests/fast/js/delete-then-put.html M LayoutTests/fast/js/dictionary-no-cache.html M LayoutTests/fast/js/do-while-semicolon.html M LayoutTests/fast/js/dot-node-base-exception.html M LayoutTests/fast/js/duplicate-param-crash.html M LayoutTests/fast/js/duplicate-param-gc-crash.html M LayoutTests/fast/js/kde/Array.html M LayoutTests/fast/js/kde/Boolean.html M LayoutTests/fast/js/kde/arguments-scope.html M LayoutTests/fast/js/kde/assignments.html M LayoutTests/fast/js/kde/cast.html M LayoutTests/fast/js/kde/comment-1.html M LayoutTests/fast/js/kde/comment-2.html M LayoutTests/fast/js/kde/completion.html M LayoutTests/fast/js/kde/conditional.html M LayoutTests/fast/js/kde/constructor_length.html M LayoutTests/fast/js/kde/crash-1.html M LayoutTests/fast/js/kde/crash-2.html M LayoutTests/fast/js/kde/delete.html RA layer request failed: MERGE request failed on '/repository/webkit/trunk': MERGE of '/repository/webkit/trunk': 409 Conflict (http://svn.webkit.org) at /usr/local/libexec/git-core//git-svn line 469 148961 30 hamaji 2009-09-21 22:30:44 -0700 Thanks Eric for cq+. It seems I'm unlucky... (In reply to comment #29) > (From update of attachment 39904 [details]) > Rejecting patch 39904 from commit-queue. This error was the same as the error as I saw. Maybe I need to contact someone who can check the SVN server. Eric, could you tell me who is the best person for this issue? 148968 31 eric 2009-09-21 23:18:42 -0700 Wow, that's a lot of spew. I guess I should have known that would be the output if the commit failed. I generally contact Mark Rowe or William Siegrist for SVN issues. 148969 32 hamaji 2009-09-21 23:32:33 -0700 Ah, sorry for the spam. Thanks for telling the contact persons. I'll ask them. 148971 33 eric 2009-09-21 23:41:06 -0700 Not your fault. I should set an size output limit on the commit-queue comments. I'll file a bug about that. Bug 29628. 148972 34 wsiegrist 2009-09-21 23:44:02 -0700 Can you do this commit manually with the standard subversion command line client and see what it says? This is probably just a normal conflict that you need to resolve. 148973 35 hamaji 2009-09-21 23:59:52 -0700 (In reply to comment #34) > Can you do this commit manually with the standard subversion command line > client and see what it says? This is probably just a normal conflict that you > need to resolve. Here is the outputs of svn up => svn ci => svn up. Note that no one committed patches while I'm trying to commit this patch. So, I'm guessing this isn't a normal conflict. http://shinh.skr.jp/t/log.txt 148976 36 eric 2009-09-22 00:24:38 -0700 For completeness sake, what version of SVN are you using to commit with? svn --version will tell you. 148979 37 hamaji 2009-09-22 00:39:31 -0700 (In reply to comment #36) > For completeness sake, what version of SVN are you using to commit with? > > svn --version will tell you. % svn --version svn, version 1.4.4 (r25188) compiled May 31 2008, 03:45:57 Actually, I've never tried to change the version of SVN client. It sounds worth trying. 148987 38 hamaji 2009-09-22 01:56:38 -0700 Well... With SVN 1.6.5, it provided much better error messages. It seems we need to remove tab characters from some files. I've created another bug for this: https://bugs.webkit.org/show_bug.cgi?id=29630 Thanks Eric for the suggestion! The error messages follow: Transmitting file data .........................................................................................................................................................................................................................................................................................svn: Commit failed (details follow): svn: Commit blocked by pre-commit hook (exit code 1) with output: svnlook: Path 'trunk/LayoutTests/fast/js/kde/script-tests' is not a file svnlook: Path 'trunk/LayoutTests/fast/js/script-tests' is not a file The following files contain tab characters: trunk/LayoutTests/fast/js/kde/script-tests/RegExp.js trunk/LayoutTests/fast/js/kde/script-tests/cast.js trunk/LayoutTests/fast/js/kde/script-tests/exceptions.js trunk/LayoutTests/fast/js/kde/script-tests/md5-1.js trunk/LayoutTests/fast/js/kde/script-tests/statements.js trunk/LayoutTests/fast/js/script-tests/regexp-extended-characters-crash.js Please use spaces instead to indent. If you must commit a file with tabs, use svn propset to set the "allow-tabs" property. 149083 39 eric 2009-09-22 10:07:41 -0700 Clearly the commit-queue needs an upgraded version of svn too. I'll do that this afternoon. I think those files had allow-tabs:1 property set on them before and that must have been lost in the svn mv that your script did. 149084 40 eric 2009-09-22 10:08:11 -0700 We can also easily just replace the tabs in those few files with 4 spaces. 149250 41 39959 hamaji 2009-09-22 16:18:14 -0700 Created attachment 39959 Patch v1 149253 42 39959 eric 2009-09-22 16:20:23 -0700 Comment on attachment 39959 Patch v1 Yay! Have you validated to make sure there are no remaining TEMPLATE.html files in resources/ ? You should do that before committing this. It would also be good to write a (short) announcement note about this change on webkit-dev. Thanks! 149257 43 hamaji 2009-09-22 16:24:37 -0700 I could commit the patch with propset. Thanks Eric for help! (In reply to comment #41) > Created an attachment (id=39959) [details] > Patch v1 This patch removes support of resource directories. After this change, it produces warning for fast/background/repeat and fast/dom/Geolocation because they still have resources/TEMPLATE.html . The former should be fixed by https://bugs.webkit.org/show_bug.cgi?id=29659 For the latter, I asked a Geolocation person to re-generate files because I couldn't set up WebKit gtk. After this patch is committed, I'll send an email to webkit-dev to remind people about script-tests again. 149258 44 hamaji 2009-09-22 16:31:59 -0700 (In reply to comment #42) > (From update of attachment 39959 [details]) > Yay! Have you validated to make sure there are no remaining TEMPLATE.html > files in resources/ ? You should do that before committing this. It would > also be good to write a (short) announcement note about this change on > webkit-dev. Well, as I've just written, there are still 2 resources/TEMPLATE.html . One of them seems to be marked as r+ by you (thanks!). I'd like to commit this patch now (before we fix the another TEMPLATE in Geolocation directory). Otherwise, people may continue to (mis)use resources directories. What do you think? 149259 45 eric 2009-09-22 16:33:03 -0700 Sounds OK. 149272 46 39959 hamaji 2009-09-22 16:52:47 -0700 Comment on attachment 39959 Patch v1 Thanks. So, I'll mark cq+ for this patch. FYI, there are three TODOs around this bug: - I notice that some js-only-tests are added after I created the migration patch. I have the list of them. I'll move them into script-tests directories. - Make sure to move Geolocation/resources/TEMPLATE.html . - Check if the files I moved had svn props before I moved these files. 149280 47 39959 commit-queue 2009-09-22 17:16:40 -0700 Comment on attachment 39959 Patch v1 Clearing flags on attachment: 39959 Committed r48660: <http://trac.webkit.org/changeset/48660> 149281 48 commit-queue 2009-09-22 17:16:47 -0700 All reviewed patches have been landed. Closing bug. 38599 2009-08-25 22:47:30 -0700 2009-09-22 16:17:41 -0700 Patch v1 bug-25880-20090826144728.patch text/plain 8169 hamaji SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ3NzcyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDgtMjUgIFNoaW5pY2hpcm8gSGFtYWpp ICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBqcyB0ZXN0cyBzaG91bGQgbW92ZSBpbnRvIGpzdGVzdHMgc3ViZGly ZWN0b3J5IGluc3RlYWQgb2YgcmVzb3VyY2VzLworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU4ODAKKworICAgICAgICBtYWtlLXNjcmlwdC13cmFwcGVy cyBzdXBwb3J0cyBib3RoIHJlc291cmNlcyBhbmQgc2NyaXB0LXRlc3RzIGRpcmVjdG9yaWVzLgor ICAgICAgICBydW4td2Via2l0LXRlc3RzIGlnbm9yZXMgZmlsZXMgaW4gc2NyaXB0LXRlc3RzLgor ICAgICAgICBNb3ZlIHNjcmlwdCB0ZXN0cyBvZiBhbmltYXRpb25zIHRvIGNoZWNrIHRoZSBuZXcg c2NyaXB0IGlzIHdvcmtpbmcuCisKKyAgICAgICAgKiBTY3JpcHRzL21ha2Utc2NyaXB0LXRlc3Qt d3JhcHBlcnM6CisgICAgICAgICogU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzOgorCiAyMDA5LTA4 LTI1ICBDYW1lcm9uIE1jQ29ybWFjayAgPGNhbUBtY2MuaWQuYXU+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL21ha2Utc2NyaXB0 LXRlc3Qtd3JhcHBlcnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9tYWtlLXNj cmlwdC10ZXN0LXdyYXBwZXJzCShyZXZpc2lvbiA0Nzc3MCkKKysrIFdlYktpdFRvb2xzL1Njcmlw dHMvbWFrZS1zY3JpcHQtdGVzdC13cmFwcGVycwkod29ya2luZyBjb3B5KQpAQCAtNjIsNyArNjIs MTUgQEAgbXkgQHRlbXBsYXRlcyA9IGZpbmRUZW1wbGF0ZUZpbGVzKEBBUkdWKQogZm9yIG15ICR0 ZmlsZSAoQHRlbXBsYXRlcykgewogCiAgICAgbXkgJHRwYXRoID0gJHRmaWxlOwotICAgICR0cGF0 aCA9fiBzOi9yZXNvdXJjZXMvVEVNUExBVEUuaHRtbCQ6OjsKKyAgICBteSAkdGVtcGxhdGVEaXJl Y3Rvcnk7CisgICAgbXkgJHRlbXBsYXRlUmVsYXRpdmVQYXRoOworICAgIGlmICgkdHBhdGggPX4g czovKHJlc291cmNlcykvVEVNUExBVEUuaHRtbCQ6OiB8fCAkdHBhdGggPX4gczovKHNjcmlwdC10 ZXN0cykvVEVNUExBVEUuaHRtbCQ6OikgeworICAgICAgICAkdGVtcGxhdGVEaXJlY3RvcnkgPSAk MTsKKyAgICAgICAgJHRlbXBsYXRlUmVsYXRpdmVQYXRoID0gJDEgLiAiL1RFTVBMQVRFLmh0bWwi OworICAgIH0gZWxzZSB7CisgICAgICAgIHByaW50ICJJbmFwcHJvcHJpYXRlIHBvc2l0aW9uIG9m IGEgdGVtcGxhdGU6ICR7dHBhdGh9XG4iOworICAgICAgICBuZXh0OworICAgIH0KIAogICAgIHBy aW50ICIke3RwYXRofVxuIjsKIApAQCAtNzMsMTUgKzgxLDE1IEBAIGZvciBteSAkdGZpbGUgKEB0 ZW1wbGF0ZXMpIHsKICAgICBteSAkZmlsZUZpbHRlciA9IHN1YiB7CiAgICAgICAgIHB1c2ggQGZp bGVzLCAkRmlsZTo6RmluZDo6bmFtZSBpZiBzdWJzdHIoJF8sIC0zKSBlcSAiLmpzIjsKICAgICB9 OwotICAgIGZpbmQoeyBwcmVwcm9jZXNzID0+IFwmZGlyZWN0b3J5RmlsdGVyLCB3YW50ZWQgPT4g JGZpbGVGaWx0ZXIgfSwgInJlc291cmNlcyIpOworICAgIGZpbmQoeyBwcmVwcm9jZXNzID0+IFwm ZGlyZWN0b3J5RmlsdGVyLCB3YW50ZWQgPT4gJGZpbGVGaWx0ZXIgfSwgJHRlbXBsYXRlRGlyZWN0 b3J5KTsKIAotICAgIG9wZW4gVEVNUExBVEUsICI8cmVzb3VyY2VzL1RFTVBMQVRFLmh0bWwiOwor ICAgIG9wZW4gVEVNUExBVEUsICI8JHt0ZW1wbGF0ZVJlbGF0aXZlUGF0aH0iOwogICAgIG15ICR0 ZW1wbGF0ZSA9IGRvIHsgbG9jYWwgJC87IDxURU1QTEFURT4gfTsKICAgICBjbG9zZSBURU1QTEFU RTsKIAogICAgIG15ICR0ZW1wbGF0ZU5lZ2F0aXZlID0gJHRlbXBsYXRlOwotICAgIGlmICgtZSAi cmVzb3VyY2VzL1RFTVBMQVRFLW4uaHRtbCIpIHsKLSAgICAgICAgb3BlbiBURU1QTEFURSwgIjxy ZXNvdXJjZXMvVEVNUExBVEUtbi5odG1sIjsKKyAgICBpZiAoLWUgIiR7dGVtcGxhdGVEaXJlY3Rv cnl9L1RFTVBMQVRFLW4uaHRtbCIpIHsKKyAgICAgICAgb3BlbiBURU1QTEFURSwgIjwke3RlbXBs YXRlRGlyZWN0b3J5fS9URU1QTEFURS1uLmh0bWwiOwogICAgICAgICAkdGVtcGxhdGVOZWdhdGl2 ZSA9IGRvIHsgbG9jYWwgJC87IDxURU1QTEFURT4gfTsKICAgICAgICAgY2xvc2UgVEVNUExBVEU7 CiAgICAgfQpAQCAtMTMzLDcgKzE0MSw3IEBAIGZvciBteSAkdGZpbGUgKEB0ZW1wbGF0ZXMpIHsK ICAgICAgICAgbmV4dCBpZiAkZmlsZSA9fiBtOnJlc291cmNlcy90ZXh0YXJlYS1pbnB1dC1ldmVu dFwuanMkOjsKIAogICAgICAgICBteSAkaHRtbCA9ICRmaWxlOwotICAgICAgICAkaHRtbCA9fiBz OnJlc291cmNlcy8oLiopXC5qczokMS5odG1sOjsKKyAgICAgICAgJGh0bWwgPX4gczoke3RlbXBs YXRlRGlyZWN0b3J5fS8oLiopXC5qczokMS5odG1sOjsKICAgICAgICAgbmV4dCBpZiAtZiAiJGh0 bWwtZGlzYWJsZWQiOwogCiAgICAgICAgIHN5c3RlbSgiZ3JlcCAtcSAnc3VjY2Vzc2Z1bGx5UGFy c2VkID0nICRmaWxlIik7CkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVz dHMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCShy ZXZpc2lvbiA0Nzc3MCkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwko d29ya2luZyBjb3B5KQpAQCAtMzgwLDcgKzM4MCw3IEBAIHN5c3RlbSAibG4iLCAiLXMiLCAkdGVz dERpcmVjdG9yeSwgIi90bXAKIAogbXkgJWlnbm9yZWRGaWxlcyA9ICgpOwogbXkgJWlnbm9yZWRE aXJlY3RvcmllcyA9IG1hcCB7ICRfID0+IDEgfSBxdyhwbGF0Zm9ybSk7Ci1teSAlaWdub3JlZExv Y2FsRGlyZWN0b3JpZXMgPSBtYXAgeyAkXyA9PiAxIH0gcXcoLnN2biBfc3ZuIHJlc291cmNlcyk7 CitteSAlaWdub3JlZExvY2FsRGlyZWN0b3JpZXMgPSBtYXAgeyAkXyA9PiAxIH0gcXcoLnN2biBf c3ZuIHJlc291cmNlcyBzY3JpcHQtdGVzdHMpOwogbXkgJXN1cHBvcnRlZEZpbGVFeHRlbnNpb25z ID0gbWFwIHsgJF8gPT4gMSB9IHF3KGh0bWwgc2h0bWwgeG1sIHhodG1sIHBsIHBocCk7CiAKICMg RklYTUU6IFdlIHNob3VsZCBmaXggd2Via2l0ZGlycy5wbTpoYXNTVkcvV01MU3VwcG9ydCgpIHRv IGRvIHRoZSBjb3JyZWN0IGZlYXR1cmUgZGV0ZWN0aW9uIGZvciBDeWd3aW4uCkluZGV4OiBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShy ZXZpc2lvbiA0Nzc3MikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDIxIEBACisyMDA5LTA4LTI1ICBTaGluaWNoaXJvIEhhbWFqaSAgPGhhbWFqaUBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAganMgdGVzdHMgc2hvdWxkIG1vdmUgaW50byBqc3Rlc3RzIHN1YmRpcmVjdG9yeSBpbnN0 ZWFkIG9mIHJlc291cmNlcy8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI1ODgwCisKKyAgICAgICAgbWFrZS1zY3JpcHQtd3JhcHBlcnMgc3VwcG9ydHMg Ym90aCByZXNvdXJjZXMgYW5kIHNjcmlwdC10ZXN0cyBkaXJlY3Rvcmllcy4KKyAgICAgICAgcnVu LXdlYmtpdC10ZXN0cyBpZ25vcmVzIGZpbGVzIGluIHNjcmlwdC10ZXN0cy4KKyAgICAgICAgTW92 ZSBzY3JpcHQgdGVzdHMgb2YgYW5pbWF0aW9ucyB0byBjaGVjayB0aGUgbmV3IHNjcmlwdCBpcyB3 b3JraW5nLgorCisgICAgICAgICogYW5pbWF0aW9ucy9hbmltYXRpb24tY3NzLXJ1bGUtdHlwZXMu aHRtbDoKKyAgICAgICAgKiBhbmltYXRpb25zL3Jlc291cmNlcy9URU1QTEFURS5odG1sOiBSZW1v dmVkLgorICAgICAgICAqIGFuaW1hdGlvbnMvcmVzb3VyY2VzL2FuaW1hdGlvbi1jc3MtcnVsZS10 eXBlcy5qczogUmVtb3ZlZC4KKyAgICAgICAgKiBhbmltYXRpb25zL3NjcmlwdC10ZXN0czogQWRk ZWQuCisgICAgICAgICogYW5pbWF0aW9ucy9zY3JpcHQtdGVzdHMvVEVNUExBVEUuaHRtbDogQ29w aWVkIGZyb20gTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9yZXNvdXJjZXMvVEVNUExBVEUuaHRtbC4K KyAgICAgICAgKiBhbmltYXRpb25zL3NjcmlwdC10ZXN0cy9hbmltYXRpb24tY3NzLXJ1bGUtdHlw ZXMuanM6IENvcGllZCBmcm9tIExheW91dFRlc3RzL2FuaW1hdGlvbnMvcmVzb3VyY2VzL2FuaW1h dGlvbi1jc3MtcnVsZS10eXBlcy5qcy4KKwogMjAwOS0wOC0yNSAgRG1pdHJ5IFRpdG92ICA8ZGlt aWNoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBCcmFkeSBFaWRzb24uCklu ZGV4OiBMYXlvdXRUZXN0cy9hbmltYXRpb25zL2FuaW1hdGlvbi1jc3MtcnVsZS10eXBlcy5odG1s Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2FuaW1hdGlvbnMvYW5pbWF0aW9uLWNzcy1ydWxl LXR5cGVzLmh0bWwJKHJldmlzaW9uIDQ3NzcwKQorKysgTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9h bmltYXRpb24tY3NzLXJ1bGUtdHlwZXMuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtNyw3ICs3LDcg QEAKIDxib2R5PgogPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+CiA8ZGl2IGlkPSJjb25zb2xlIj48 L2Rpdj4KLTxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvYW5pbWF0aW9uLWNzcy1ydWxlLXR5cGVzLmpz Ij48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJzY3JpcHQtdGVzdHMvYW5pbWF0aW9uLWNzcy1ydWxl LXR5cGVzLmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9q cy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgogPC9ib2R5PgogPC9odG1sPgpJbmRleDogTGF5b3V0 VGVzdHMvYW5pbWF0aW9ucy9yZXNvdXJjZXMvVEVNUExBVEUuaHRtbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9hbmltYXRpb25zL3Jlc291cmNlcy9URU1QTEFURS5odG1sCShyZXZpc2lvbiA0 Nzc3MCkKKysrIExheW91dFRlc3RzL2FuaW1hdGlvbnMvcmVzb3VyY2VzL1RFTVBMQVRFLmh0bWwJ KHdvcmtpbmcgY29weSkKQEAgLTEsMTMgKzAsMCBAQAotPCFET0NUWVBFIEhUTUwgUFVCTElDICIt Ly9JRVRGLy9EVEQgSFRNTC8vRU4iPgotPGh0bWw+Ci08aGVhZD4KLTxsaW5rIHJlbD0ic3R5bGVz aGVldCIgaHJlZj0iLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgotPHNj cmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4K LTwvaGVhZD4KLTxib2R5PgotPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Ci08ZGl2IGlkPSJjb25z b2xlIj48L2Rpdj4KLTxzY3JpcHQgc3JjPSJZT1VSX0pTX0ZJTEVfSEVSRSI+PC9zY3JpcHQ+Ci08 c2NyaXB0IHNyYz0iLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3Njcmlw dD4KLTwvYm9keT4KLTwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL2FuaW1hdGlvbnMvcmVzb3Vy Y2VzL2FuaW1hdGlvbi1jc3MtcnVsZS10eXBlcy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9hbmltYXRpb25zL3Jlc291cmNlcy9hbmltYXRpb24tY3NzLXJ1bGUtdHlwZXMuanMJKHJldmlz aW9uIDQ3NzcwKQorKysgTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9yZXNvdXJjZXMvYW5pbWF0aW9u LWNzcy1ydWxlLXR5cGVzLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xLDExICswLDAgQEAKLWRlc2Ny aXB0aW9uKAotJ1RoaXMgdGVzdCBjaGVja3MgdGhhdCB0aGUgQ1NTUnVsZSBSdWxlVHlwZXMgZm9y IGtleWZyYW1lLXJlbGF0ZWQgcnVsZXMgYXJlIHdoYXQgd2UgZXhwZWN0LicKLSk7Ci0KLXZhciBy dWxlVHlwZSA9IHdpbmRvdy5DU1NSdWxlLldFQktJVF9LRVlGUkFNRVNfUlVMRTsKLXNob3VsZEJl KCJydWxlVHlwZSIsICI4Iik7Ci1ydWxlVHlwZSA9IHdpbmRvdy5DU1NSdWxlLldFQktJVF9LRVlG UkFNRV9SVUxFOwotc2hvdWxkQmUoInJ1bGVUeXBlIiwgIjkiKTsKLQotZGVidWcoJ0lmIHdlIGdv dCB0byB0aGlzIHBvaW50IHRoZW4gd2UgZGlkIG5vdCBjcmFzaCBhbmQgdGhlIHRlc3QgaGFzIHBh c3NlZC4nKTsKLXZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOwpJbmRleDogTGF5b3V0VGVz dHMvYW5pbWF0aW9ucy9zY3JpcHQtdGVzdHMvVEVNUExBVEUuaHRtbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9hbmltYXRpb25zL3NjcmlwdC10ZXN0cy9URU1QTEFURS5odG1sCShyZXZpc2lv biA0Nzc3MCkJKGZyb20gTGF5b3V0VGVzdHMvYW5pbWF0aW9ucy9yZXNvdXJjZXMvVEVNUExBVEUu aHRtbDo0Nzc3MCkKKysrIExheW91dFRlc3RzL2FuaW1hdGlvbnMvc2NyaXB0LXRlc3RzL1RFTVBM QVRFLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMyBAQAorPCFET0NUWVBFIEhUTUwg UFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJl bD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5j c3MiPgorPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48 L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2 IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQgc3JjPSJZT1VSX0pTX0ZJTEVfSEVSRSI+PC9z Y3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0Lmpz Ij48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL2FuaW1hdGlv bnMvc2NyaXB0LXRlc3RzL2FuaW1hdGlvbi1jc3MtcnVsZS10eXBlcy5qcwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9hbmltYXRpb25zL3NjcmlwdC10ZXN0cy9hbmltYXRpb24tY3NzLXJ1bGUt dHlwZXMuanMJKHJldmlzaW9uIDQ3NzcwKQkoZnJvbSBMYXlvdXRUZXN0cy9hbmltYXRpb25zL3Jl c291cmNlcy9hbmltYXRpb24tY3NzLXJ1bGUtdHlwZXMuanM6NDc3NzApCisrKyBMYXlvdXRUZXN0 cy9hbmltYXRpb25zL3NjcmlwdC10ZXN0cy9hbmltYXRpb24tY3NzLXJ1bGUtdHlwZXMuanMJKHdv cmtpbmcgY29weSkKQEAgLTAsMCArMSwxMSBAQAorZGVzY3JpcHRpb24oCisnVGhpcyB0ZXN0IGNo ZWNrcyB0aGF0IHRoZSBDU1NSdWxlIFJ1bGVUeXBlcyBmb3Iga2V5ZnJhbWUtcmVsYXRlZCBydWxl cyBhcmUgd2hhdCB3ZSBleHBlY3QuJworKTsKKwordmFyIHJ1bGVUeXBlID0gd2luZG93LkNTU1J1 bGUuV0VCS0lUX0tFWUZSQU1FU19SVUxFOworc2hvdWxkQmUoInJ1bGVUeXBlIiwgIjgiKTsKK3J1 bGVUeXBlID0gd2luZG93LkNTU1J1bGUuV0VCS0lUX0tFWUZSQU1FX1JVTEU7CitzaG91bGRCZSgi cnVsZVR5cGUiLCAiOSIpOworCitkZWJ1ZygnSWYgd2UgZ290IHRvIHRoaXMgcG9pbnQgdGhlbiB3 ZSBkaWQgbm90IGNyYXNoIGFuZCB0aGUgdGVzdCBoYXMgcGFzc2VkLicpOwordmFyIHN1Y2Nlc3Nm dWxseVBhcnNlZCA9IHRydWU7 39329 2009-09-10 01:36:04 -0700 2009-09-19 03:41:24 -0700 A huge migration done by script patch text/plain 0 hamaji 39331 2009-09-10 01:41:35 -0700 2009-09-10 01:41:35 -0700 script for the above patch move-test-dir.py text/plain 1406 hamaji IyEvdXNyL2Jpbi9weXRob24KCmltcG9ydCBvcwppbXBvcnQgb3MucGF0aAoKcGlwZSA9IG9zLnBv cGVuKCdwZXJsIFdlYktpdFRvb2xzL1NjcmlwdHMvbWFrZS1zY3JpcHQtdGVzdC13cmFwcGVycycp CmN1cnJlbnRfZGlyID0gTm9uZQpmb3IgbGluZSBpbiBwaXBlOgogICAgaWYgbGluZS5zdGFydHN3 aXRoKCcgJyk6CiAgICAgICAgaHRtbF9uYW1lID0gbGluZS5zdHJpcCgpCiAgICAgICAgaHRtbF9w YXRoID0gb3MucGF0aC5qb2luKGN1cnJlbnRfZGlyLCBodG1sX25hbWUpCiAgICAgICAganNfbmFt ZSA9IGh0bWxfbmFtZS5yZXBsYWNlKCcuaHRtbCcsICcuanMnKQogICAgICAgIGpzX29sZF9kaXIg PSBvcy5wYXRoLmpvaW4oY3VycmVudF9kaXIsICdyZXNvdXJjZXMnKQogICAgICAgIGpzX29sZF9w YXRoID0gb3MucGF0aC5qb2luKGpzX29sZF9kaXIsIGpzX25hbWUpCiAgICAgICAganNfbmV3X2Rp ciA9IG9zLnBhdGguam9pbihjdXJyZW50X2RpciwgJ3NjcmlwdC10ZXN0cycpCiAgICAgICAganNf bmV3X3BhdGggPSBvcy5wYXRoLmpvaW4oanNfbmV3X2RpciwganNfbmFtZSkKICAgICAgICB0ZW1w bGF0ZV9vbGRfcGF0aCA9IG9zLnBhdGguam9pbihqc19vbGRfZGlyLCAnVEVNUExBVEUuaHRtbCcp CiAgICAgICAgdGVtcGxhdGVfbmV3X3BhdGggPSBvcy5wYXRoLmpvaW4oanNfbmV3X2RpciwgJ1RF TVBMQVRFLmh0bWwnKQogICAgICAgIHRlbXBsYXRlX25fb2xkX3BhdGggPSBvcy5wYXRoLmpvaW4o anNfb2xkX2RpciwgJ1RFTVBMQVRFLW4uaHRtbCcpCiAgICAgICAgdGVtcGxhdGVfbl9uZXdfcGF0 aCA9IG9zLnBhdGguam9pbihqc19uZXdfZGlyLCAnVEVNUExBVEUtbi5odG1sJykKCiAgICAgICAg aWYgbm90IG9zLnBhdGguZXhpc3RzKGpzX29sZF9wYXRoKToKICAgICAgICAgICAgY29udGludWUK CiAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKGpzX25ld19kaXIpOgogICAgICAgICAgICBv cy5ta2Rpcihqc19uZXdfZGlyKQogICAgICAgICAgICBvcy5zeXN0ZW0oJ3N2biBhZGQgJXMnICUg anNfbmV3X2RpcikKCiAgICAgICAgaWYgb3MucGF0aC5leGlzdHModGVtcGxhdGVfb2xkX3BhdGgp OgogICAgICAgICAgICBvcy5zeXN0ZW0oJ3N2biBtdiAlcyAlcycgJSAodGVtcGxhdGVfb2xkX3Bh dGgsIHRlbXBsYXRlX25ld19wYXRoKSkKCiAgICAgICAgaWYgb3MucGF0aC5leGlzdHModGVtcGxh dGVfbl9vbGRfcGF0aCk6CiAgICAgICAgICAgIG9zLnN5c3RlbSgnc3ZuIG12ICVzICVzJyAlICh0 ZW1wbGF0ZV9uX29sZF9wYXRoLCB0ZW1wbGF0ZV9uX25ld19wYXRoKSkKCiAgICAgICAgb3Muc3lz dGVtKCdzdm4gbXYgJXMgJXMnICUgKGpzX29sZF9wYXRoLCBqc19uZXdfcGF0aCkpCgogICAgZWxz ZToKICAgICAgICBjdXJyZW50X2RpciA9IGxpbmUuc3RyaXAoKQo= 39817 2009-09-19 03:41:24 -0700 2009-09-21 22:06:39 -0700 last migration patch I couldn't commit p text/plain 0 hamaji 39904 2009-09-21 22:06:39 -0700 2009-09-22 16:18:07 -0700 last migration patch changelog fixed p text/plain 0 hamaji 39959 2009-09-22 16:18:14 -0700 2009-09-22 17:16:40 -0700 Patch v1 bug-25880-20090923081812.patch text/plain 4614 hamaji ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxMDg0NzI3Li42ZjlkNTkzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDkt MjIgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBqcyB0ZXN0cyBzaG91bGQgbW92 ZSBpbnRvIGpzdGVzdHMgc3ViZGlyZWN0b3J5IGluc3RlYWQgb2YgcmVzb3VyY2VzLworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjU4ODAKKworICAgICAg ICBSZW1vdmUgc3VwcG9ydCBvZiByZXNvdXJjZXMgZGlyZWN0b3J5LgorCisgICAgICAgICogU2Ny aXB0cy9tYWtlLXNjcmlwdC10ZXN0LXdyYXBwZXJzOgorCiAyMDA5LTA5LTIyICBFcmljIFNlaWRl bCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBObyByZXZpZXcsIG9ubHkgZml4aW5nIHR5 cG8gKG1pc3Npbmcgc3BhY2UgY2hhcmFjdGVyKS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvbWFrZS1zY3JpcHQtdGVzdC13cmFwcGVycyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbWFr ZS1zY3JpcHQtdGVzdC13cmFwcGVycwppbmRleCBlYTE5MTRmLi4xMzM0NzZjIDEwMDc1NQotLS0g YS9XZWJLaXRUb29scy9TY3JpcHRzL21ha2Utc2NyaXB0LXRlc3Qtd3JhcHBlcnMKKysrIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy9tYWtlLXNjcmlwdC10ZXN0LXdyYXBwZXJzCkBAIC02NCw3ICs2NCw3 IEBAIGZvciBteSAkdGZpbGUgKEB0ZW1wbGF0ZXMpIHsKICAgICBteSAkdHBhdGggPSAkdGZpbGU7 CiAgICAgbXkgJHRlbXBsYXRlRGlyZWN0b3J5OwogICAgIG15ICR0ZW1wbGF0ZVJlbGF0aXZlUGF0 aDsKLSAgICBpZiAoJHRwYXRoID1+IHM6LyhyZXNvdXJjZXMpL1RFTVBMQVRFLmh0bWwkOjogfHwg JHRwYXRoID1+IHM6LyhzY3JpcHQtdGVzdHMpL1RFTVBMQVRFLmh0bWwkOjopIHsKKyAgICBpZiAo JHRwYXRoID1+IHM6LyhzY3JpcHQtdGVzdHMpL1RFTVBMQVRFLmh0bWwkOjopIHsKICAgICAgICAg JHRlbXBsYXRlRGlyZWN0b3J5ID0gJDE7CiAgICAgICAgICR0ZW1wbGF0ZVJlbGF0aXZlUGF0aCA9 ICQxIC4gIi9URU1QTEFURS5odG1sIjsKICAgICB9IGVsc2UgewpAQCAtOTUsNTcgKzk1LDYgQEAg Zm9yIG15ICR0ZmlsZSAoQHRlbXBsYXRlcykgewogICAgIH0KIAogICAgIGZvciBteSAkZmlsZSAo QGZpbGVzKSB7Ci0gICAgICAgIG5leHQgaWYgJGZpbGUgPX4gL2pzLXRlc3QtLipcLmpzJC87Ci0g ICAgICAgIG5leHQgaWYgJGZpbGUgPX4gL2Nvb2tpZXMtdGVzdC0ocG9zdHxwcmUpXC5qcyQvOwot ICAgICAgICBuZXh0IGlmICRmaWxlID1+IC9zdGFuZGFsb25lLS4qXC5qcyQvOwotICAgICAgICBu ZXh0IGlmICRmaWxlID1+IC9TVkdUZXN0Q2FzZVwuanMvOwotICAgICAgICBuZXh0IGlmICRmaWxl ID1+IC9XTUxUZXN0Q2FzZVwuanMvOwotCi0gICAgICAgIG5leHQgaWYgJGZpbGUgPX4gbTpyZXNv dXJjZXMvYm9tLWluLWZpbGUtcmV0YWlucy1jb3JyZWN0LW9mZnNldFwuanMkOjsgIyBoYXMgYSBj dXN0b20gdGVtcGxhdGUKLSAgICAgICAgbmV4dCBpZiAkZmlsZSA9fiBtOnJlc291cmNlcy9OU1Jl c29sdmVyLWV4Y2VwdGlvbnNcLmpzJDo7Ci0gICAgICAgIG5leHQgaWYgJGZpbGUgPX4gbTpyZXNv dXJjZXMvV2luZG93UHJvcGVydGllc1wuanMkOjsKLSAgICAgICAgbmV4dCBpZiAkZmlsZSA9fiBt OnJlc291cmNlcy9hbHRHbHlwaC1kb21cLmpzJDo7Ci0gICAgICAgIG5leHQgaWYgJGZpbGUgPX4g bTpyZXNvdXJjZXMvYXR0ci1jYXNlLXNlbnNpdGl2aXR5XC5qcyQ6OwotICAgICAgICBuZXh0IGlm ICRmaWxlID1+IG06cmVzb3VyY2VzL2JveC1vcmllbnQtYnV0dG9uXC5qcyQ6OwotICAgICAgICBu ZXh0IGlmICRmaWxlID1+IG06cmVzb3VyY2VzL2JveC1zaGFkb3ctb3ZlcmZsb3ctc2Nyb2xsXC5q cyQ6OwotICAgICAgICBuZXh0IGlmICRmaWxlID1+IG06cmVzb3VyY2VzL2NhbnZhcy0yZC1pbWFn ZURhdGEtY3JlYXRlLW5vbmZpbml0ZVwuanMkOjsKLSAgICAgICAgbmV4dCBpZiAkZmlsZSA9fiBt OnJlc291cmNlcy9jb2RlZ2VuLXRlbXBvcmFyaWVzLW11bHRpcGxlLWdsb2JhbC1ibG9ja3MtMVwu anMkOjsKLSAgICAgICAgbmV4dCBpZiAkZmlsZSA9fiBtOnJlc291cmNlcy9jb2RlZ2VuLXRlbXBv cmFyaWVzLW11bHRpcGxlLWdsb2JhbC1ibG9ja3MtMlwuanMkOjsKLSAgICAgICAgbmV4dCBpZiAk ZmlsZSA9fiBtOnJlc291cmNlcy9jb25zdFwuanMkOjsKLSAgICAgICAgbmV4dCBpZiAkZmlsZSA9 fiBtOnJlc291cmNlcy9jb25zdHJ1Y3RvcnMtY2FjaGVkLW5hdmlnYXRlXC5qcyQ6OwotICAgICAg ICBuZXh0IGlmICRmaWxlID1+IG06cmVzb3VyY2VzL2Vycm9yXC5qcyQ6OwotICAgICAgICBuZXh0 IGlmICRmaWxlID1+IG06cmVzb3VyY2VzL2ZyYW1lLWxvYWRpbmctdmlhLWRvY3VtZW50LXdyaXRl XC5qcyQ6OwotICAgICAgICBuZXh0IGlmICRmaWxlID1+IG06cmVzb3VyY2VzL2lkLWZhc3RwYXRo LWFsbW9zdC1zdHJpY3RcLmpzJDo7Ci0gICAgICAgIG5leHQgaWYgJGZpbGUgPX4gbTpyZXNvdXJj ZXMvaWQtZmFzdHBhdGgtc3RyaWN0XC5qcyQ6OwotICAgICAgICBuZXh0IGlmICRmaWxlID1+IG06 cmVzb3VyY2VzL2ludGVyc2VjdHNOb2RlXC5qcyQ6OwotICAgICAgICBuZXh0IGlmICRmaWxlID1+ IG06cmVzb3VyY2VzL3AtaW4tc2NvcGVcLmpzJDo7Ci0gICAgICAgIG5leHQgaWYgJGZpbGUgPX4g bTpyZXNvdXJjZXMvcGFzdGUtYmxvY2txdW90ZS1iZWZvcmUtYmxvY2txdW90ZVwuanMkOjsKLSAg ICAgICAgbmV4dCBpZiAkZmlsZSA9fiBtOnJlc291cmNlcy9wZXJtaXNzaW9uLWRlbmllZFwuanMk OjsKLSAgICAgICAgbmV4dCBpZiAkZmlsZSA9fiBtOnJlc291cmNlcy9wZXJtaXNzaW9uLWRlbmll ZC1zdG9wcy13YXRjaGVzXC5qcyQ6OwotICAgICAgICBuZXh0IGlmICRmaWxlID1+IG06cmVzb3Vy Y2VzL3Bvc2l0aW9uLXN0cmluZ1wuanMkOjsKLSAgICAgICAgbmV4dCBpZiAkZmlsZSA9fiBtOnJl c291cmNlcy9yZWZsZWN0aW9uLW92ZXJmbG93LXNjcm9sbFwuanMkOjsKLSAgICAgICAgbmV4dCBp ZiAkZmlsZSA9fiBtOnJlc291cmNlcy9zY3JpcHQtZWxlbWVudC1nY1wuanMkOjsKLSAgICAgICAg bmV4dCBpZiAkZmlsZSA9fiBtOnJlc291cmNlcy9zY3JpcHQtZWxlbWVudC1nY1wuanMkOjsKLSAg ICAgICAgbmV4dCBpZiAkZmlsZSA9fiBtOnJlc291cmNlcy9zY3JpcHQzXC5qcyQ6OwotICAgICAg ICBuZXh0IGlmICRmaWxlID1+IG06cmVzb3VyY2VzL3NjcmlwdDRcLmpzJDo7Ci0gICAgICAgIG5l eHQgaWYgJGZpbGUgPX4gbTpyZXNvdXJjZXMvc2NyaXB0NVwuanMkOjsKLSAgICAgICAgbmV4dCBp ZiAkZmlsZSA9fiBtOnJlc291cmNlcy9zY3JpcHRlZC1yYW5kb21cLmpzJDo7Ci0gICAgICAgIG5l eHQgaWYgJGZpbGUgPX4gbTpyZXNvdXJjZXMvc2VsZWN0LW9wdGlvbnMtcmVtb3ZlXC5qcyQ6Owot ICAgICAgICBuZXh0IGlmICRmaWxlID1+IG06cmVzb3VyY2VzL3NoYWRvdy1vZmZzZXRcLmpzJDo7 Ci0gICAgICAgIG5leHQgaWYgJGZpbGUgPX4gbTpyZXNvdXJjZXMvc3VjY2Vzc1wuanMkOjsKLSAg ICAgICAgbmV4dCBpZiAkZmlsZSA9fiBtOnJlc291cmNlcy90YWJpbmRleC1mb2N1cy1ibHVyLWFs bFwuanMkOjsKLSAgICAgICAgbmV4dCBpZiAkZmlsZSA9fiBtOnJlc291cmNlcy91c2UtaW5zdGFu Y2VSb290LWV2ZW50LWJ1YmJsaW5nXC5qcyQ6OwotICAgICAgICBuZXh0IGlmICRmaWxlID1+IG06 cmVzb3VyY2VzL3VzZS1pbnN0YW5jZVJvb3QtZXZlbnQtbGlzdGVuZXJzXC5qcyQ6OwotICAgICAg ICBuZXh0IGlmICRmaWxlID1+IG06cmVzb3VyY2VzL3dhdGNoXC5qcyQ6OwotICAgICAgICBuZXh0 IGlmICRmaWxlID1+IG06cmVzb3VyY2VzL3dpbmRvdy1wcm9wZXJ0aWVzXC5qcyQ6OwotICAgICAg ICBuZXh0IGlmICRmaWxlID1+IG06cmVzb3VyY2VzL3dyYXBwZXItaWRlbnRpdHktYmFzZVwuanMk OjsKLSAgICAgICAgbmV4dCBpZiAkZmlsZSA9fiBtOnJlc291cmNlcy94aHRtbC1zY3JpcHRzXC5q cyQ6OwotICAgICAgICBuZXh0IGlmICRmaWxlID1+IG06cmVzb3VyY2VzL2luc3RhbmNlb2Ytb3Bl cmF0b3ItZHVtbXktd29ya2VyXC5qcyQ6OwotICAgICAgICBuZXh0IGlmICRmaWxlID1+IG06cmVz b3VyY2VzL2pzb24yLWVzNS1jb21wYXRcLmpzJDo7Ci0gICAgICAgIG5leHQgaWYgJGZpbGUgPX4g bTpyZXNvdXJjZXMvSlNPTi1zdHJpbmdpZnlcLmpzJDo7Ci0gICAgICAgIG5leHQgaWYgJGZpbGUg PX4gbTpyZXNvdXJjZXMvSlNPTi1wYXJzZVwuanMkOjsKLSAgICAgICAgbmV4dCBpZiAkZmlsZSA9 fiBtOnJlc291cmNlcy90ZXh0YXJlYS1pbnB1dC1ldmVudFwuanMkOjsKLQogICAgICAgICBteSAk aHRtbCA9ICRmaWxlOwogICAgICAgICAkaHRtbCA9fiBzOiR7dGVtcGxhdGVEaXJlY3Rvcnl9Lygu KilcLmpzOiQxLmh0bWw6OwogICAgICAgICBuZXh0IGlmIC1mICIkaHRtbC1kaXNhYmxlZCI7