diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -595,7 +595,7 @@ CDATA_EVIL = re.compile(br"[\000-\010\01 # list in group 2, and the preceeding line output in group 1: # # output..output (feature !)\n -optline = re.compile(b'(.+) \((.+?) !\)\n$') +optline = re.compile(b'(.*) \((.+?) !\)\n$') def cdatasafe(data): """Make a string safe to include in a CDATA block. diff --git a/tests/test-logtoprocess.t b/tests/test-logtoprocess.t --- a/tests/test-logtoprocess.t +++ b/tests/test-logtoprocess.t @@ -45,9 +45,11 @@ Use sort to avoid ordering issues betwee + (chg !) 0 a message: spam command + command (chg !) commandfinish foo foo @@ -55,8 +57,11 @@ Use sort to avoid ordering issues betwee foo foo exited 0 after * seconds (glob) logtoprocess command output: + logtoprocess command output: (chg !) logtoprocess commandfinish output: logtoprocess foo output: + serve --cmdserver chgunix * (glob) (chg !) + serve --cmdserver chgunix * (glob) (chg !) spam Confirm that logging blocked time catches stdio properly: