parallel-tests: Fix summary output.

* lib/am/check.am (am__text_box): Fix unportable sed script,
replacing `\n' in the right hand side of an `s' command with
a literal newline.  Kudos to Bruno Haible for the newline idea.
* tests/parallel-tests.test: Update test to expose this.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index e7d014546d5c5eb496228c4a1350ca1cd1739348..ae46e23eb3a622b105ddf893bdee7016e5bedc17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       parallel-tests: Fix summary output.
+       * lib/am/check.am (am__text_box): Fix unportable sed script,
+       replacing `\n' in the right hand side of an `s' command with
+       a literal newline.  Kudos to Bruno Haible for the newline idea.
+       * tests/parallel-tests.test: Update test to expose this.
+
 2009-03-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Overhaul of tests/README.

diff --git a/lib/am/check.am b/lib/am/check.am
index 77e62714f35178550eb9811b20d3a08f166d6185..c01a25a294a81c779c12f76d21b7ac7862707d76 100644 (file)
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -75,7 +75,8 @@ am__rst_title   = sed 's/.*/   &   /;h;s/./=/g;p;x;p;g;p;s/.*//'
 am__rst_section = sed 'p;s/./=/g;p;g'
 
 # Put stdin (possibly several lines separated by ".  ") in a box.
-am__text_box = sed 's/\.  /\n/g' | sed '/^$$/d' |              \
+am__text_box = { nlinit=`echo 'nl="'; echo '"'`; eval "$$nlinit"; \
+  sed "s/\\.  /\\$$nl/g"; } | sed '/^$$/d' |                   \
 $(AWK) '{ if (final) final = final "\n" $$0; else final = $$0; }\
 max < length($$0) { max = length($$0); }                       \
 END {                                                          \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index af615dc454f6cc7127676f2109fc86873c02ae15..78365acdc1097a2f032684a969287a25ed3b42d1 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -92,7 +92,8 @@ am__base_list = \
 am__rst_title = sed 's/.*/   &   /;h;s/./=/g;p;x;p;g;p;s/.*//'
 am__rst_section = sed 'p;s/./=/g;p;g'
 # Put stdin (possibly several lines separated by ".  ") in a box.
-am__text_box = sed 's/\.  /\n/g' | sed '/^$$/d' |              \
+am__text_box = { nlinit=`echo 'nl="'; echo '"'`; eval "$$nlinit"; \
+  sed "s/\\.  /\\$$nl/g"; } | sed '/^$$/d' |                   \
 $(AWK) '{ if (final) final = final "\n" $$0; else final = $$0; }\
 max < length($$0) { max = length($$0); }                       \
 END {                                                          \

diff --git a/tests/parallel-tests.test b/tests/parallel-tests.test
index 6e4b8782d62e099aac1e74d0eec500a10c5ec4d8..2482f30b6013a2eae75a6f7824110cff0a915605 100755 (executable)
--- a/tests/parallel-tests.test
+++ b/tests/parallel-tests.test
@@ -70,6 +70,8 @@ test `grep -c '^FAIL' mylog.log` -eq 1
 test -f baz.log
 test -f bar.log
 test -f foo.log
+# The summary should be formatted correctly.
+grep 'failedn' stdout && Exit 1
 
 # clean should remove all log files (but not more).
 : > unrelated.log