Bug 31536 – GitTest.test_create_binary_patch fails if /tmp is symlink

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Shinichiro Hamaji]

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)

[Shinichiro Hamaji]

Created attachment 43281 [details]
Patch v1

[Eric Seidel (no email)]

Comment on attachment 43281 [details]
Patch v1

LGTM.  Thanks again for all your recent work at making our tools work better with git!

[Shinichiro Hamaji]

Comment on attachment 43281 [details]
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

[Shinichiro Hamaji]

Comment on attachment 43281 [details]
Patch v1

Clearing flags on attachment: 43281

Committed r51173: <http://trac.webkit.org/changeset/51173>

[Shinichiro Hamaji]

All reviewed patches have been landed.  Closing bug.