[PATCH 3 of 4 V2] run-tests: don't drop optional lines after a missing unconditional line
Matt Harbison
mharbison72 at gmail.com
Tue Jul 18 22:16:49 EDT 2017
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1500353831 14400
# Tue Jul 18 00:57:11 2017 -0400
# Node ID ef6f06aee9e83554b4c0e80dcf961d7e8aec712a
# Parent eb1f3dfdcc4467529ce78cf4c34ade350e57e8a1
run-tests: don't drop optional lines after a missing unconditional line
The previous behavior was to bail out when hitting 'awol', so 'missing (?)' was
also dropped.
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1421,7 +1421,7 @@
# Don't append as optional line
continue
else:
- break
+ continue
postout.append(b' ' + el)
if lcmd:
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
@@ -177,6 +177,13 @@
> b.r (re) (true !)
> missing (?)
> awol (true !)
+ >
+ > The "missing" line should stay, even though awol is dropped
+ > $ echo 'testing'
+ > test.ng (re) (true !)
+ > foo.ar (?)
+ > awol
+ > missing (?)
> EOF
$ rt test-failure.t
@@ -194,13 +201,22 @@
foobar*foo (glob) (false !)
te*ting (glob) (true !)
- @@ -13,6 +11,4 @@
+ foo.ar (re) (false !)
+ missing (?)
+ @@ -13,13 +11,10 @@
$ echo 'testing'
test.ng (re) (true !)
foo.ar (re) (false !)
- b.r (re) (true !)
missing (?)
- awol (true !)
+
+ The "missing" line should stay, even though awol is dropped
+ $ echo 'testing'
+ test.ng (re) (true !)
+ foo.ar (?)
+ - awol
+ missing (?)
ERROR: test-failure.t output changed
!
More information about the Mercurial-devel
mailing list