[PATCH 02 of 11 STABLE] tests: add "(glob)" to paths in test-run-tests.t for Windows

FUJIWARA Katsunori foozy at lares.dti.ne.jp
Mon Oct 20 08:26:56 CDT 2014


# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1413810488 -32400
#      Mon Oct 20 22:08:08 2014 +0900
# Branch stable
# Node ID 8ffac97b85a5b2888f67e9b9a4d0cada7171fc76
# Parent  ef382dbe8c20ee19e984ed26c8c46f93e50bf229
tests: add "(glob)" to paths in test-run-tests.t for Windows

diff --git a/tests/test-run-tests.t b/tests/test-run-tests.t
--- a/tests/test-run-tests.t
+++ b/tests/test-run-tests.t
@@ -51,8 +51,8 @@ failing test
 test --xunit support
   $ $TESTDIR/run-tests.py --with-hg=`which hg` --xunit=xunit.xml
   
-  --- $TESTTMP/test-failure.t
-  +++ $TESTTMP/test-failure.t.err
+  --- $TESTTMP/test-failure.t (glob)
+  +++ $TESTTMP/test-failure.t.err (glob)
   @@ -1,4 +1,4 @@
      $ echo babar
   -  rataxes
@@ -71,8 +71,8 @@ test --xunit support
   <testsuite errors="0" failures="1" name="run-tests" skipped="0" tests="2">
     <testcase name="test-success.t" time="*"/> (glob)
     <testcase name="test-failure.t" time="*"> (glob)
-  <![CDATA[--- $TESTTMP/test-failure.t
-  +++ $TESTTMP/test-failure.t.err
+  <![CDATA[--- $TESTTMP/test-failure.t (glob)
+  +++ $TESTTMP/test-failure.t.err (glob)
   @@ -1,4 +1,4 @@
      $ echo babar
   -  rataxes
@@ -140,8 +140,8 @@ failed
 failure w/ keyword
   $ $TESTDIR/run-tests.py --with-hg=`which hg` -k rataxes
   
-  --- $TESTTMP/test-failure.t
-  +++ $TESTTMP/test-failure.t.err
+  --- $TESTTMP/test-failure.t (glob)
+  +++ $TESTTMP/test-failure.t.err (glob)
   @@ -1,4 +1,4 @@
      $ echo babar
   -  rataxes
@@ -271,8 +271,8 @@ Refuse the fix
 
   $ echo 'n' | $TESTDIR/run-tests.py --with-hg=`which hg` -i
   
-  --- $TESTTMP/test-failure.t
-  +++ $TESTTMP/test-failure.t.err
+  --- $TESTTMP/test-failure.t (glob)
+  +++ $TESTTMP/test-failure.t.err (glob)
   @@ -1,4 +1,4 @@
      $ echo babar
   -  rataxes
@@ -296,7 +296,7 @@ Refuse the fix
 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
   !.
@@ -308,7 +308,7 @@ Interactive with custom view
 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
   !.
@@ -321,8 +321,8 @@ Accept the fix
 
   $ echo 'y' | $TESTDIR/run-tests.py --with-hg=`which hg` -i
   
-  --- $TESTTMP/test-failure.t
-  +++ $TESTTMP/test-failure.t.err
+  --- $TESTTMP/test-failure.t (glob)
+  +++ $TESTTMP/test-failure.t.err (glob)
   @@ -1,4 +1,4 @@
      $ echo babar
   -  rataxes
@@ -418,8 +418,8 @@ test for --json
 
   $ $TESTDIR/run-tests.py --with-hg=`which hg` --json
   
-  --- $TESTTMP/test-failure.t
-  +++ $TESTTMP/test-failure.t.err
+  --- $TESTTMP/test-failure.t (glob)
+  +++ $TESTTMP/test-failure.t.err (glob)
   @@ -1,4 +1,4 @@
      $ echo babar
   -  rataxes


More information about the Mercurial-devel mailing list