Mercurial > hg-stable
changeset 23348:bbe56e07e07a
tests: fix globs for Windows
test-largefiles-update.t, test-subrepo.t, test-tag.t, and
test-rename-dir-merge.t still warn about no result returned because of
unnecessary globs that test-check-code-hg.t wants, relating to output for
pushing to, pulling from and moving X to Y.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 16 Nov 2014 16:26:15 -0500 |
| parents | 49cdf51cbc6c |
| children | 7dd1870120b2 |
| files | tests/test-config.t tests/test-largefiles-misc.t tests/test-largefiles.t tests/test-locate.t tests/test-manifest.t tests/test-mq-subrepo.t tests/test-run-tests.t tests/test-subrepo.t |
| diffstat | 8 files changed, 26 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-config.t Tue Nov 04 12:46:00 2014 -0500 +++ b/tests/test-config.t Sun Nov 16 16:26:15 2014 -0500 @@ -7,7 +7,7 @@ > novaluekey > EOF $ hg showconfig - hg: parse error at $TESTTMP/.hg/hgrc:1: novaluekey + hg: parse error at $TESTTMP/.hg/hgrc:1: novaluekey (glob) [255] Invalid syntax: no key @@ -16,7 +16,7 @@ > =nokeyvalue > EOF $ hg showconfig - hg: parse error at $TESTTMP/.hg/hgrc:1: =nokeyvalue + hg: parse error at $TESTTMP/.hg/hgrc:1: =nokeyvalue (glob) [255] Test hint about invalid syntax from leading white space @@ -25,7 +25,7 @@ > key=value > EOF $ hg showconfig - hg: parse error at $TESTTMP/.hg/hgrc:1: key=value + hg: parse error at $TESTTMP/.hg/hgrc:1: key=value (glob) unexpected leading whitespace [255] @@ -34,7 +34,7 @@ > key=value > EOF $ hg showconfig - hg: parse error at $TESTTMP/.hg/hgrc:1: [section] + hg: parse error at $TESTTMP/.hg/hgrc:1: [section] (glob) unexpected leading whitespace [255]
--- a/tests/test-largefiles-misc.t Tue Nov 04 12:46:00 2014 -0500 +++ b/tests/test-largefiles-misc.t Sun Nov 16 16:26:15 2014 -0500 @@ -482,7 +482,7 @@ b $ hg -R clone2 outgoing --large --graph --template "{rev}" - comparing with $TESTTMP/issue3651/src + comparing with $TESTTMP/issue3651/src (glob) searching for changes @ 1
--- a/tests/test-largefiles.t Tue Nov 04 12:46:00 2014 -0500 +++ b/tests/test-largefiles.t Sun Nov 16 16:26:15 2014 -0500 @@ -1787,7 +1787,7 @@ $ hg cat .hglf/sub/large4 e166e74c7303192238d60af5a9c4ce9bef0b7928 $ hg cat .hglf/normal3 - .hglf/normal3: no such file in rev 598410d3eb9a + .hglf/normal3: no such file in rev 598410d3eb9a (glob) [1] Test that renaming a largefile results in correct output for status
--- a/tests/test-locate.t Tue Nov 04 12:46:00 2014 -0500 +++ b/tests/test-locate.t Sun Nov 16 16:26:15 2014 -0500 @@ -96,10 +96,10 @@ $ hg files b - dir.h/foo + dir.h/foo (glob) t.h - t/e.h - t/x + t/e.h (glob) + t/x (glob) $ hg files b b @@ -130,11 +130,11 @@ ../t/e.h (glob) $ hg files - ../b - ../dir.h/foo - ../t.h - ../t/e.h - ../t/x + ../b (glob) + ../dir.h/foo (glob) + ../t.h (glob) + ../t/e.h (glob) + ../t/x (glob) $ hg files . [1]
--- a/tests/test-manifest.t Tue Nov 04 12:46:00 2014 -0500 +++ b/tests/test-manifest.t Sun Nov 16 16:26:15 2014 -0500 @@ -26,7 +26,7 @@ $ hg files -vr . 2 a - 2 x b/a + 2 x b/a (glob) 1 l l $ hg files -r . -X b a
--- a/tests/test-mq-subrepo.t Tue Nov 04 12:46:00 2014 -0500 +++ b/tests/test-mq-subrepo.t Sun Nov 16 16:26:15 2014 -0500 @@ -243,7 +243,7 @@ [255] $ hg revert sub reverting subrepo sub - adding sub/a + adding sub/a (glob) $ hg qpop popping 1.diff now at: 0.diff @@ -262,7 +262,7 @@ [255] $ hg revert sub reverting subrepo sub - adding sub/a + adding sub/a (glob) $ hg qpush applying 1.diff subrepository sub diverged (local revision: b2fdb12cd82b, remote revision: aa037b301eba)
--- a/tests/test-run-tests.t Tue Nov 04 12:46:00 2014 -0500 +++ b/tests/test-run-tests.t Sun Nov 16 16:26:15 2014 -0500 @@ -33,8 +33,8 @@ $ $TESTDIR/run-tests.py --with-hg=`which hg` - --- $TESTTMP/test-failure.t (glob) - +++ $TESTTMP/test-failure.t.err (glob) + --- $TESTTMP/test-failure.t + +++ $TESTTMP/test-failure.t.err @@ -1,4 +1,4 @@ $ echo babar - rataxes @@ -87,8 +87,8 @@ $ $TESTDIR/run-tests.py --with-hg=`which hg` --retest - --- $TESTTMP/test-failure.t (glob) - +++ $TESTTMP/test-failure.t.err (glob) + --- $TESTTMP/test-failure.t + +++ $TESTTMP/test-failure.t.err @@ -1,4 +1,4 @@ $ echo babar - rataxes @@ -121,8 +121,8 @@ $ $TESTDIR/run-tests.py --with-hg=`which hg` test-failure.t - --- $TESTTMP/test-failure.t (glob) - +++ $TESTTMP/test-failure.t.err (glob) + --- $TESTTMP/test-failure.t + +++ $TESTTMP/test-failure.t.err @@ -1,4 +1,4 @@ $ echo babar - rataxes @@ -274,7 +274,7 @@ Interactive with custom view $ echo 'n' | $TESTDIR/run-tests.py --with-hg=`which hg` -i --view echo - $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err + $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err (glob) Accept this change? [n]* (glob) ERROR: test-failure.t output changed !. @@ -286,7 +286,7 @@ View the fix $ echo 'y' | $TESTDIR/run-tests.py --with-hg=`which hg` --view echo - $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err + $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err (glob) ERROR: test-failure.t output changed !.
--- a/tests/test-subrepo.t Tue Nov 04 12:46:00 2014 -0500 +++ b/tests/test-subrepo.t Sun Nov 16 16:26:15 2014 -0500 @@ -1324,7 +1324,7 @@ $ echo phasecheck4 >> t/t $ hg commit -S -m phasecheck4 committing subrepository s - committing subrepository s/ss + committing subrepository s/ss (glob) warning: changes are committed in secret phase from subrepository ss committing subrepository t warning: changes are committed in secret phase from subrepository s