diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-21 05:14:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-21 05:14:47 (GMT) |
| commit | cdc34664d4bb86063062dd63183dfb6b9ebf4772 (patch) | |
| tree | 5925eb54e2aefe3c6685c9ff65326cc86533b1cf /t | |
| parent | a91df69cbb5ced7837525106ff57ff349180770b (diff) | |
| parent | d98f24cd9d8d8ee20b65d22ec6b78da04b48de85 (diff) | |
| download | git-cdc34664d4bb86063062dd63183dfb6b9ebf4772.zip git-cdc34664d4bb86063062dd63183dfb6b9ebf4772.tar.gz git-cdc34664d4bb86063062dd63183dfb6b9ebf4772.tar.bz2 | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.4.2
Work around broken ln on solaris as used in t8006
t/README: Add a note about running commands under valgrind
Diffstat (limited to 't')
| -rw-r--r-- | t/README | 7 | ||||
| -rwxr-xr-x | t/t8006-blame-textconv.sh | 3 |
2 files changed, 9 insertions, 1 deletions
@@ -102,6 +102,13 @@ appropriately before running "make". not see any output, this option implies --verbose. For convenience, it also implies --tee. + Note that valgrind is run with the option --leak-check=no, + as the git process is short-lived and some errors are not + interesting. In order to run a single command under the same + conditions manually, you should set GIT_VALGRIND to point to + the 't/valgrind/' directory and use the commands under + 't/valgrind/bin/'. + --tee:: In addition to printing the test output to the terminal, write it to files named 't/test-results/$TEST_NAME.out'. diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh index ea64cd8..32ec82a 100755 --- a/t/t8006-blame-textconv.sh +++ b/t/t8006-blame-textconv.sh @@ -25,7 +25,8 @@ test_expect_success 'setup ' ' echo "bin: test 1 version 2" >one.bin && echo "bin: test number 2 version 2" >>two.bin && if test_have_prereq SYMLINKS; then - ln -sf two.bin symlink.bin + rm symlink.bin && + ln -s two.bin symlink.bin fi && GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00" ' |