Mercurial > hg
comparison tests/test-extdiff.t @ 32216:98bb992bef19
test-extdiff: enable a previously failing test on Windows
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 06 May 2017 22:48:06 -0400 |
parents | f41cc3dd73d6 |
children | affd753ddaf1 |
comparison
equal
deleted
inserted
replaced
32215:f41cc3dd73d6 | 32216:98bb992bef19 |
---|---|
329 > echo "** custom diff **" | 329 > echo "** custom diff **" |
330 > EOF | 330 > EOF |
331 #if execbit | 331 #if execbit |
332 $ chmod +x dir/tool.sh | 332 $ chmod +x dir/tool.sh |
333 #endif | 333 #endif |
334 | |
335 Windows can't run *.sh directly, so create a shim executable that can be. | |
336 Without something executable, the next hg command will try to run `tl` instead | |
337 of $tool (and fail). | |
338 #if windows | |
339 $ cat > dir/tool.bat <<EOF | |
340 > @sh -c "`pwd`/dir/tool.sh %1 %2" | |
341 > EOF | |
342 $ tool=`pwd`/dir/tool.bat | |
343 #else | |
334 $ tool=`pwd`/dir/tool.sh | 344 $ tool=`pwd`/dir/tool.sh |
335 | 345 #endif |
336 TODO: Fix this on Windows. It currently tries to run 'tl a.* a', instead of | 346 |
337 falling back to tool.sh | |
338 #if no-windows | |
339 $ hg --debug tl --config extdiff.tl= --config merge-tools.tl.executable=$tool | 347 $ hg --debug tl --config extdiff.tl= --config merge-tools.tl.executable=$tool |
340 making snapshot of 2 files from rev * (glob) | 348 making snapshot of 2 files from rev * (glob) |
341 a | 349 a |
342 b | 350 b |
343 making snapshot of 2 files from working directory | 351 making snapshot of 2 files from working directory |
344 a | 352 a |
345 b | 353 b |
346 running '$TESTTMP/a/dir/tool.sh a.* a' in */extdiff.* (glob) | 354 running '$TESTTMP/a/dir/tool.bat a.* a' in */extdiff.* (glob) (windows !) |
355 running '$TESTTMP/a/dir/tool.sh a.* a' in */extdiff.* (glob) (no-windows !) | |
347 ** custom diff ** | 356 ** custom diff ** |
348 cleaning up temp directory | 357 cleaning up temp directory |
349 [1] | 358 [1] |
350 #endif | |
351 | 359 |
352 $ cd .. | 360 $ cd .. |
353 | 361 |
354 #if symlink | 362 #if symlink |
355 | 363 |