summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorLibravatar Torsten Bögershausen <tboegi@web.de>2017-05-10 16:06:19 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-10 19:15:08 -0700
commitc8f7c8b7042ba51f9bfd24aba7aaab4007365380 (patch)
tree38f4c1b1ce937a6d548c8bf6b48c7fe8ea036560 /t/t6023-merge-file.sh
parentGit 2.13-rc1 (diff)
downloadtgif-c8f7c8b7042ba51f9bfd24aba7aaab4007365380.tar.xz
t0027: tests are not expensive; remove t0025
The purpose of t0027 is to test all CRLF related conversions at "git checkout" and "git add". Running t0027 under Git for Windows takes 3-4 minutes, so the whole script had been marked as "EXPENSIVE". However, the "Git for Windows" fork overrides this since 2014: "t0027 is marked expensive, but really, for MinGW we want to run these tests always." The test seems not to be expensive on other platforms at all: it takes less than 14 seconds under Linux, and 63 seconds under Mac Os X, and this is more or less the same with a SSD or a spinning disk. So let's drop the "EXPENSIVE" prereq. While at it, retire t0025; recent "stress" tests show that t0025 is flaky, reported by Lars Schneider <larsxschneider@gmail.com>, but all tests in t0025 are covered by t0027 already. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions