[PATCH] test: Account again for variations in error messages

[eugene.loh@oracle.com]

From: Eugene Loh <eugene.loh@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 shorter error
message (without the "enumerator" label) and adjust one .r file
accordingly.

Signed-off-by: Eugene Loh <eugene.loh@oracle.com>
---
 test/unittest/types/err.D_UNKNOWN.dupstruct.r | 2 +-
 test/utils/libctf.r.p                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unittest/types/err.D_UNKNOWN.dupstruct.r b/test/unittest/types/err.D_UNKNOWN.dupstruct.r
index 762b24f4c..7afa74aa7 100644
--- a/test/unittest/types/err.D_UNKNOWN.dupstruct.r
+++ b/test/unittest/types/err.D_UNKNOWN.dupstruct.r
@@ -1,2 +1,2 @@
 -- @@stderr --
-dtrace: failed to compile script test/unittest/types/err.D_UNKNOWN.dupstruct.d: [D_UNKNOWN] line 17: failed to define member 'x': Duplicate member, enumerator, or variable name
+dtrace: failed to compile script test/unittest/types/err.D_UNKNOWN.dupstruct.d: [D_UNKNOWN] line 17: failed to define member 'x': Duplicate member or variable name
diff --git a/test/utils/libctf.r.p b/test/utils/libctf.r.p
index 8a6fd8b13..b7c8a5e04 100755
--- a/test/utils/libctf.r.p
+++ b/test/utils/libctf.r.p
@@ -3,10 +3,10 @@
 # http://oss.oracle.com/licenses/upl.
 
 # Possible 'enumerator' label.
-/Duplicate member or variable name/ { sub(/Duplicate member/, "&, enumerator,"); }
+/Duplicate member, enumerator, or variable name/ { sub(/ber, enumerator, or var/, "ber or var"); }
 
 # Possible trailing '.'.
-/Duplicate member, enumerator, or variable name\.$/ { sub(/\.$/, ""); }
+/Duplicate member or variable name\.$/ { sub(/\.$/, ""); }
 /Member name not found\.$/ { sub(/\.$/, ""); }
 
 # Could be union or struct.
-- 
2.47.3