[DTrace-devel] [PATCH v2] test: Account again for variations in error messages

[eugene.loh at oracle.com]

From: Eugene Loh <eugene.loh at oracle.com>

In commit 944dac095 ("test: Account for variations in error messages"),
an attempt was made to account for variations in error messages.

However, it was applied to the branch after commit 49e646183
("test: dupstruct: fix extra duplicate identifier case"), and conflict
resolution was not consistent.  The earlier patch "standardized"
messages by applying an optional "enumerator" where that label was
missing;  the subsequent patch did the opposite.  Subsequently, some
logic got messed up.

Fix up the logic.  In particular, standardize on the newer error
message (with the "enumerator" label).

Signed-off-by: Eugene Loh <eugene.loh at oracle.com>
---
 test/utils/libctf.r.p | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/utils/libctf.r.p b/test/utils/libctf.r.p
index 8a6fd8b13..504d4b59e 100755
--- a/test/utils/libctf.r.p
+++ b/test/utils/libctf.r.p
@@ -16,7 +16,7 @@
 /\[D_DECL_IDRED\] line [1-9][0-9]*: identifier redeclared: [a-zA-Z]*$/ {
 	sub(/\[D_DECL_IDRED\] line [1-9][0-9]*: .*$/, "expected error");
 }
-/\[D_UNKNOWN\] line [1-9][0-9]*: failed to define enumerator '[a-zA-Z]*': Duplicate member or variable name$/ {
+/\[D_UNKNOWN\] line [1-9][0-9]*: failed to define enumerator '[a-zA-Z]*': Duplicate member, enumerator, or variable name$/ {
 	sub(/\[D_UNKNOWN\] line [1-9][0-9]*: .*$/, "expected error");
 }
 
-- 
2.47.3