31536 2009-11-16 02:10:14 -0800 GitTest.test_create_binary_patch fails if /tmp is symlink 2009-11-18 21:47:57 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hamaji webkit-unassigned oldest_to_newest 163902 0 hamaji 2009-11-16 02:10:14 -0800 It seems git add /tmp/.../foo fails if /tmp is a symbolic link because git considers this operation is done from outside the repository. For example, typical Mac's /tmp is /private/tmp. In this case, this operation is trying to modify /tmp_git_test_checkout/foo from /private/tmp/tmp_git_test_checkout/, which git dislikes. > ./WebKitTools/Scripts/run-webkit-unittests GitTest.test_create_binary_patch E ====================================================================== ERROR: test_create_binary_patch (modules.scm_unittest.GitTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/hamaji/GitKit/WebKitTools/Scripts/modules/scm_unittest.py", line 569, in test_create_binary_patch run(['git', 'add', test_file_path]) File "/Users/hamaji/GitKit/WebKitTools/Scripts/modules/scm_unittest.py", line 48, in run return SCM.run_command(args, cwd=cwd) File "/Users/hamaji/GitKit/WebKitTools/Scripts/modules/scm.py", line 138, in run_command error_handler(script_error) File "/Users/hamaji/GitKit/WebKitTools/Scripts/modules/scm.py", line 109, in default_error_handler raise error ScriptError: Failed to run "['git', 'add', '/tmp/tmpM4wgJGgit_test_checkout/binary_file']" exit_code: 128 ---------------------------------------------------------------------- Ran 1 test in 6.193s FAILED (errors=1) 163903 1 43281 hamaji 2009-11-16 02:11:14 -0800 Created attachment 43281 Patch v1 164782 2 43281 eric 2009-11-18 15:41:09 -0800 Comment on attachment 43281 Patch v1 LGTM. Thanks again for all your recent work at making our tools work better with git! 164899 3 43281 hamaji 2009-11-18 21:33:25 -0800 Comment on attachment 43281 Patch v1 Rejecting patch 43281 from commit-queue. Failed to run "['git', 'svn', 'rebase']" exit_code: 1 Last 500 characters of output: 8f90067 (trunk) M WebCore/ChangeLog M WebCore/html/HTMLInputElement.cpp r51170 = d6a819cc491fa9514d5186c71dbb3090f3beac63 (trunk) M WebCore/ChangeLog M WebCore/platform/qt/QWebPageClient.h r51171 = bc68e0d81f5427b13321581e6528732cf6ed4288 (trunk) First, rewinding head to replay your work on top of it... error: Untracked working tree file 'LayoutTests/fast/ruby/ruby-remove-expected.txt' would be overwritten by merge. could not detach HEAD rebase refs/remotes/trunk: command returned error: 1 164906 4 43281 hamaji 2009-11-18 21:47:48 -0800 Comment on attachment 43281 Patch v1 Clearing flags on attachment: 43281 Committed r51173: <http://trac.webkit.org/changeset/51173> 164907 5 hamaji 2009-11-18 21:47:57 -0800 All reviewed patches have been landed. Closing bug. 43281 2009-11-16 02:11:14 -0800 2009-11-18 21:47:48 -0800 Patch v1 bug-31536-20091116191112.patch text/plain 2288 hamaji ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmYTUzYzllLi43MTRjOGI4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMTEt MTYgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBHaXRUZXN0LnRlc3RfY3JlYXRl X2JpbmFyeV9wYXRjaCBmYWlscyBpZiAvdG1wIGlzIHN5bWxpbmsKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxNTM2CisKKyAgICAgICAgKiBTY3JpcHRz L21vZHVsZXMvc2NtX3VuaXR0ZXN0LnB5OgorCiAyMDA5LTExLTE1ICBTaGluaWNoaXJvIEhhbWFq aSAgPGhhbWFqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlk ZWwuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvc2NtX3VuaXR0ZXN0 LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3NjbV91bml0dGVzdC5weQppbmRleCAy NWQ5NmMyLi41Nzc5MThiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv c2NtX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9zY21fdW5p dHRlc3QucHkKQEAgLTU2MywyMyArNTYzLDI0IEBAIGNsYXNzIEdpdFRlc3QoU0NNVGVzdCk6CiAg ICAgZGVmIHRlc3RfY3JlYXRlX2JpbmFyeV9wYXRjaChzZWxmKToKICAgICAgICAgIyBDcmVhdGUg YSBnaXQgYmluYXJ5IHBhdGNoIGFuZCBjaGVjayB0aGUgY29udGVudHMuCiAgICAgICAgIHNjbSA9 IGRldGVjdF9zY21fc3lzdGVtKHNlbGYuZ2l0X2NoZWNrb3V0X3BhdGgpCi0gICAgICAgIHRlc3Rf ZmlsZV9wYXRoID0gb3MucGF0aC5qb2luKHNlbGYuZ2l0X2NoZWNrb3V0X3BhdGgsICdiaW5hcnlf ZmlsZScpCisgICAgICAgIHRlc3RfZmlsZV9uYW1lID0gJ2JpbmFyeV9maWxlJworICAgICAgICB0 ZXN0X2ZpbGVfcGF0aCA9IG9zLnBhdGguam9pbihzZWxmLmdpdF9jaGVja291dF9wYXRoLCB0ZXN0 X2ZpbGVfbmFtZSkKICAgICAgICAgZmlsZV9jb250ZW50cyA9ICcnLmpvaW4obWFwKGNociwgcmFu Z2UoMjU2KSkpCiAgICAgICAgIHdyaXRlX2ludG9fZmlsZV9hdF9wYXRoKHRlc3RfZmlsZV9wYXRo LCBmaWxlX2NvbnRlbnRzKQotICAgICAgICBydW4oWydnaXQnLCAnYWRkJywgdGVzdF9maWxlX3Bh dGhdKQorICAgICAgICBydW4oWydnaXQnLCAnYWRkJywgdGVzdF9maWxlX25hbWVdKQogICAgICAg ICBwYXRjaCA9IHNjbS5jcmVhdGVfcGF0Y2goKQogICAgICAgICBzZWxmLmFzc2VydFRydWUocmUu c2VhcmNoKHInXG5saXRlcmFsIDBcbicsIHBhdGNoKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVl KHJlLnNlYXJjaChyJ1xubGl0ZXJhbCAyNTZcbicsIHBhdGNoKSkKIAogICAgICAgICAjIENoZWNr IGlmIHdlIGNhbiBhcHBseSB0aGUgY3JlYXRlZCBwYXRjaC4KLSAgICAgICAgcnVuKFsnZ2l0Jywg J3JtJywgJy1mJywgdGVzdF9maWxlX3BhdGhdKQorICAgICAgICBydW4oWydnaXQnLCAncm0nLCAn LWYnLCB0ZXN0X2ZpbGVfbmFtZV0pCiAgICAgICAgIHNlbGYuX3NldHVwX3dlYmtpdHRvb2xzX3Nj cmlwdHNfc3ltbGluayhzY20pCiAgICAgICAgIHNlbGYuc2NtLmFwcGx5X3BhdGNoKHNlbGYuX2Ny ZWF0ZV9wYXRjaChwYXRjaCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZmlsZV9jb250ZW50 cywgcmVhZF9mcm9tX3BhdGgodGVzdF9maWxlX3BhdGgpKQogCiAgICAgICAgICMgQ2hlY2sgaWYg d2UgY2FuIGNyZWF0ZSBhIHBhdGNoIGZyb20gYSBsb2NhbCBjb21taXQuCiAgICAgICAgIHdyaXRl X2ludG9fZmlsZV9hdF9wYXRoKHRlc3RfZmlsZV9wYXRoLCBmaWxlX2NvbnRlbnRzKQotICAgICAg ICBydW4oWydnaXQnLCAnYWRkJywgdGVzdF9maWxlX3BhdGhdKQorICAgICAgICBydW4oWydnaXQn LCAnYWRkJywgdGVzdF9maWxlX25hbWVdKQogICAgICAgICBydW4oWydnaXQnLCAnY29tbWl0Jywg Jy1tJywgJ2JpbmFyeSBkaWZmJ10pCiAgICAgICAgIHBhdGNoX2Zyb21fbG9jYWxfY29tbWl0ID0g c2NtLmNyZWF0ZV9wYXRjaF9mcm9tX2xvY2FsX2NvbW1pdCgnSEVBRCcpCiAgICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShyZS5zZWFyY2gocidcbmxpdGVyYWwgMFxuJywgcGF0Y2hfZnJvbV9sb2NhbF9j b21taXQpKQo=