Patchwork [2,of,2] test-run-tests: glob away a --debug run difference on Windows

login
register
mail settings
Submitter Matt Harbison
Date Dec. 23, 2015, 4:22 a.m.
Message ID <8a697c356fdb61a36de9.1450844576@Envy>
Download mbox | patch
Permalink /patch/12261/
State Accepted
Delegated to: Yuya Nishihara
Headers show

Comments

Matt Harbison - Dec. 23, 2015, 4:22 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1448298841 18000
#      Mon Nov 23 12:14:01 2015 -0500
# Node ID 8a697c356fdb61a36de9aaf6877052454f6a66e9
# Parent  8f83787abed009b037f0c94cb42207b34c9c87b8
test-run-tests: glob away a --debug run difference on Windows

This internal test is piped through 'grep -v pwd' to eliminate the pwd alias set
when running with MSYS.  Unfortunately, the '.' from the successful run of the
prior internal test precedes the pwd alias for the next test on the same line,
so grep filters out '.' too, except for the final test.

It also looks like there may be a bug with --debug: the output of the internal
test that had this diff says 2 ran, 0 failed (one test being test-failure.t),
but if --debug is omitted from the internal test, then it says 2 ran, 1 failed.

With this longstanding issue fixed, the test suite finally runs cleanly on
Windows (except subrepo merge documented in issue 4988), with 88 skips.  \o/

Patch

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
@@ -238,7 +238,7 @@ 
   babar
   + echo *SALT* 4 0 (glob)
   *SALT* 4 0 (glob)
-  .+ echo *SALT* 0 0 (glob)
+  *+ echo *SALT* 0 0 (glob)
   *SALT* 0 0 (glob)
   + echo babar
   babar