diff tests/test-run-tests.t @ 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 d33a90cb2a32
children e8b09f920fe6
line wrap: on
line diff
--- 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
   !.