[DTrace-devel] [PATCH v3 03/21] Revert "test, options: work around a subtle lexer bug"

Nick Alcock nick.alcock at oracle.com
Tue Jan 16 21:12:59 UTC 2024


This reverts commit ae9f2a137438b2e3798ff532bd986fe3abfd9c8a.

(Technically this is not a strict reversion: we fix the line number too,
because the previous fixes slightly change the reported error.  But
conceptually it is one.)
---
 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.43.0.272.gce700b77fd




More information about the DTrace-devel mailing list