From a3e7e1baa3bb9bb95ecd754a1bb3e4806d9ffecc Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 12 Aug 2011 23:49:57 +0200 Subject: [PATCH] testsuite: fix an unportable use of sed * tests/tap-todo-skip-whitespace.test: Alternation with "\|" in sed regular expressions is not portable to (at least) FreeBSD sed; do not use it. --- ChangeLog | 7 +++++++ tests/tap-todo-skip-whitespace.test | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 98ce73e9c..bf629e11c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-08-12 Stefano Lattarini + + testsuite: fix an unportable use of sed + * tests/tap-todo-skip-whitespace.test: Alternation with "\|" in + sed regular expressions is not portable to (at least) FreeBSD + sed; do not use it. + 2011-08-12 Stefano Lattarini testsuite: avoid spurious failure if rst2html program is missing diff --git a/tests/tap-todo-skip-whitespace.test b/tests/tap-todo-skip-whitespace.test index 695e98c2c..fe32c97a3 100755 --- a/tests/tap-todo-skip-whitespace.test +++ b/tests/tap-todo-skip-whitespace.test @@ -76,7 +76,7 @@ my_make_check () # Don't be too strict w.r.t. possible normalization of "TODO: foo" into # "TODO : foo" (as is done by, e.g., the 'TAP::Parser' perl module). LC_ALL=C grep '^[A-Z][A-Z]*:' stdout \ - | sed -e 's/# \(TODO\|SKIP\) *:/# \1:/' > got + | sed -e 's/# TODO *:/# TODO:/' -e 's/# SKIP *:/# SKIP:/' > got cat exp cat got diff exp got -- 2.47.2