Mercurial > hg-stable

changeset 41621:67e622ade415

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: stabilize test-extdiff.t on Windows The test harness only wanted to drop the (windows !) lines, which also means the actual output matched the (no-windows !) lines. So drop those annotations too. I suspect if the output of the affected tests was actually collected on Windows, things were quoted because TEMPDIR contained a `~` in MSYS. Typically that happens when the username is 9 (8?) or more characters. I explicitly set TEMP and TMP to something short like "C:\temp" to avoid this, because otherwise there are a bunch of failures like this in other tests.
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 06 Feb 2019 23:41:36 -0500
parents 698667eb7523
children 286eeed14893
files tests/test-extdiff.t
diffstat 1 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-extdiff.t	Wed Feb 06 22:30:49 2019 -0500
+++ b/tests/test-extdiff.t	Wed Feb 06 23:41:36 2019 -0500
@@ -151,10 +151,8 @@
 Test --per-file option for gui tool:
 
   $ hg --config extdiff.gui.alabalaf=True alabalaf -c 6 --per-file --debug
-  diffing "*\\extdiff.*\\a.46c0e4daeb72\\a" "a.81906f2b98ac\\a" (glob) (windows !)
-  diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) (no-windows !)
-  diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !)
-  diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !)
+  diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob)
+  diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob)
   making snapshot of 2 files from rev 46c0e4daeb72
     a
     b
@@ -169,10 +167,8 @@
 Test --per-file option for gui tool again:
 
   $ hg --config merge-tools.alabalaf.gui=True alabalaf -c 6 --per-file --debug
-  diffing "*\\extdiff.*\\a.46c0e4daeb72\\a" "a.81906f2b98ac\\a" (glob) (windows !)
-  diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) (no-windows !)
-  diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !)
-  diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !)
+  diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob)
+  diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob)
   making snapshot of 2 files from rev 46c0e4daeb72
     a
     b