[DTrace-devel] [PATCH v2 04/23] tests: drop bug workaround that is no longer needed

[Kris Van Hees]

On Mon, Nov 27, 2023 at 04:47:10PM +0000, Nick Alcock wrote:
> Signed-off-by: Nick Alcock <nick.alcock at oracle.com>

Why is this not simply a revert of commit ae9f2a13
("test, options: work around a subtle lexer bug")?  That would seem like a more
clean solution than a patch that effectively does the same (without being a
revert).

> ---
>  test/unittest/options/err.pspec-default.r   | 2 +-
>  test/unittest/options/err.pspec-default.r.p | 4 ----
>  2 files changed, 1 insertion(+), 5 deletions(-)
>  delete mode 100755 test/unittest/options/err.pspec-default.r.p
> 
> diff --git a/test/unittest/options/err.pspec-default.r b/test/unittest/options/err.pspec-default.r
> index 6b25f56173d8..e2ea0ec2687e 100644
> --- a/test/unittest/options/err.pspec-default.r
> +++ b/test/unittest/options/err.pspec-default.r
> @@ -1,2 +1,2 @@
>  -- @@stderr --
> -dtrace: failed to compile script test/unittest/options/err.pspec-default.d: line 14: syntax error near
> +dtrace: failed to compile script test/unittest/options/err.pspec-default.d: line 15: syntax error near end-of-input
> diff --git a/test/unittest/options/err.pspec-default.r.p b/test/unittest/options/err.pspec-default.r.p
> deleted file mode 100755
> index a01bdaddebbd..000000000000
> --- a/test/unittest/options/err.pspec-default.r.p
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -#!/bin/sed -f
> -# Chop off everything after the 'near' in the error message, to evade a bug
> -# at EOF in our scanner under flex < 2.6.
> -s/syntax error near.*$/syntax error near/g
> -- 
> 2.42.0.271.g85384428f1
> 
>