test: Account for variations in error messages
PATCH 1/1 test: Account for variations in error messages
From: Eugene Loh <[email protected]>
Clearly,
test/unittest/enum/err.*RepeatIdentifiers.d test/unittest/types/err.*dupenum.d
are impacted, but so are
test/unittest/offsetof/err.D_UNKNOWN.OffsetofNULL.d test/unittest/types/err.D_UNKNOWN.dupstruct.d test/unittest/union/err.D_DECL_INCOMPLETE.circular.d test/unittest/union/err.D_DECL_INCOMPLETE.order.d test/unittest/union/err.D_DECL_INCOMPLETE.simple.d
due to symlinks to libctf.r.p. And dupstruct needed a fix.
---
.../enum/err.D_DECL_IDRED.RepeatIdentifiers.r | 2 --
...tIdentifiers.d => err.RepeatIdentifiers.d} | 7 +++----
test/unittest/enum/err.RepeatIdentifiers.r | 2 ++
...ntifiers.r.p => err.RepeatIdentifiers.r.p} | 0
.../unittest/types/err.D_DECL_IDRED.dupenum.r | 2 --
...r.D_DECL_IDRED.dupenum.d => err.dupenum.d} | 4 +++-
test/unittest/types/err.dupenum.r | 2 ++
...DECL_IDRED.dupenum.r.p => err.dupenum.r.p} | 0
test/utils/libctf.r.p | 19 +++++++++++++++++++
9 files changed, 29 insertions(+), 9 deletions(-)
delete mode 100644 test/unittest/enum/err.D_DECL_IDRED.RepeatIdentifiers.r
rename test/unittest/enum/{err.D_DECL_IDRED.RepeatIdentifiers.d => err.RepeatIdentifiers.d} (78%)
create mode 100644 test/unittest/enum/err.RepeatIdentifiers.r
rename test/unittest/enum/{err.D_DECL_IDRED.RepeatIdentifiers.r.p => err.RepeatIdentifiers.r.p} (100%)
delete mode 100644 test/unittest/types/err.D_DECL_IDRED.dupenum.r
rename test/unittest/types/{err.D_DECL_IDRED.dupenum.d => err.dupenum.d} (74%)
create mode 100644 test/unittest/types/err.dupenum.r
rename test/unittest/types/{err.D_DECL_IDRED.dupenum.r.p => err.dupenum.r.p} (100%)test/unittest/enum/err.D_DECL_IDRED.RepeatIdentifiers.r deleted +0 -2
@@ -1,2 +0,0 @@ --- @@stderr -- -dtrace: failed to compile script test/unittest/enum/err.D_DECL_IDRED.RepeatIdentifiers.d: [D_DECL_IDRED] line 24: identifier redeclared: GREEN
test/unittest/enum/err.RepeatIdentifiers.d renamed from test/unittest/enum/err.D_DECL_IDRED.RepeatIdentifiers.d +3 -4
@@ -1,6 +1,6 @@ /* * Oracle Linux DTrace. - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved. * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. */
@@ -11,11 +11,10 @@ * error. * * SECTION: Type and Constant Definitions/Enumerations - * - * NOTES: - * */ +/* @@runtest-opts: -xerrtags */ + #pragma D option quiet enum colors {
test/unittest/enum/err.RepeatIdentifiers.r new file +2 -0
@@ -0,0 +1,2 @@ +-- @@stderr -- +dtrace: failed to compile script test/unittest/enum/err.RepeatIdentifiers.d: expected error
test/unittest/enum/err.RepeatIdentifiers.r.p renamed from test/unittest/enum/err.D_DECL_IDRED.RepeatIdentifiers.r.p +0 -0
test/unittest/types/err.D_DECL_IDRED.dupenum.r deleted +0 -2
@@ -1,2 +0,0 @@ --- @@stderr -- -dtrace: failed to compile script test/unittest/types/err.D_DECL_IDRED.dupenum.d: [D_DECL_IDRED] line 18: identifier redeclared: x
test/unittest/types/err.dupenum.d renamed from test/unittest/types/err.D_DECL_IDRED.dupenum.d +3 -1
@@ -1,6 +1,6 @@ /* * Oracle Linux DTrace. - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved. * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. */
@@ -12,6 +12,8 @@ * SECTION: Type and Constant Definitions/Enumerations */ +/* @@runtest-opts: -xerrtags */ + enum foo { x = 3, x = 4
test/unittest/types/err.dupenum.r new file +2 -0
@@ -0,0 +1,2 @@ +-- @@stderr -- +dtrace: failed to compile script test/unittest/types/err.dupenum.d: expected error
test/unittest/types/err.dupenum.r.p renamed from test/unittest/types/err.D_DECL_IDRED.dupenum.r.p +0 -0
test/utils/libctf.r.p +19 -0
@@ -1,7 +1,26 @@ #!/usr/bin/gawk -f # Licensed under the Universal Permissive License v 1.0 as shown at # http://oss.oracle.com/licenses/upl. + +# Possible "enumerator" label. +/Duplicate member, enumerator, or variable name/ { + sub(/member, enumerator, or variable/, "member or variable"); +} + +# Possible trailing '.'. /Duplicate member or variable name\.$/ { sub(/\.$/, ""); } /Member name not found\.$/ { sub(/\.$/, ""); } + +# Could be union or struct. /enum union pirate:/ { sub(/enum union pirate/, "enum struct pirate"); } + +# Older or newer libctf diags. +/\[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$/ { + sub(/\[D_UNKNOWN\] line [1-9][0-9]*: .*$/, "expected error"); +} + +# Print. { print; }
Signature · 1 line
2.47.3
Quoted 13 lines · On Tue, Oct 07, 2025 at 06:39:50PM -0400, [email protected] wrote:
From: Eugene Loh <[email protected]>
Clearly,
test/unittest/enum/err.*RepeatIdentifiers.d test/unittest/types/err.*dupenum.d
are impacted, but so are
test/unittest/offsetof/err.D_UNKNOWN.OffsetofNULL.d test/unittest/types/err.D_UNKNOWN.dupstruct.d test/unittest/union/err.D_DECL_INCOMPLETE.circular.d test/unittest/union/err.D_DECL_INCOMPLETE.order.d test/unittest/union/err.D_DECL_INCOMPLETE.simple.d
due to symlinks to libctf.r.p. And dupstruct needed a fix.
Quoted 1 line
Signed-off-by Eugene Loh <[email protected]>
Sad that we need to do this, but...
Quoted 147 lines
--- .../enum/err.D_DECL_IDRED.RepeatIdentifiers.r | 2 -- ...tIdentifiers.d => err.RepeatIdentifiers.d} | 7 +++---- test/unittest/enum/err.RepeatIdentifiers.r | 2 ++ ...ntifiers.r.p => err.RepeatIdentifiers.r.p} | 0 .../unittest/types/err.D_DECL_IDRED.dupenum.r | 2 -- ...r.D_DECL_IDRED.dupenum.d => err.dupenum.d} | 4 +++- test/unittest/types/err.dupenum.r | 2 ++ ...DECL_IDRED.dupenum.r.p => err.dupenum.r.p} | 0 test/utils/libctf.r.p | 19 +++++++++++++++++++ 9 files changed, 29 insertions(+), 9 deletions(-) delete mode 100644 test/unittest/enum/err.D_DECL_IDRED.RepeatIdentifiers.r rename test/unittest/enum/{err.D_DECL_IDRED.RepeatIdentifiers.d => err.RepeatIdentifiers.d} (78%) create mode 100644 test/unittest/enum/err.RepeatIdentifiers.r rename test/unittest/enum/{err.D_DECL_IDRED.RepeatIdentifiers.r.p => err.RepeatIdentifiers.r.p} (100%) delete mode 100644 test/unittest/types/err.D_DECL_IDRED.dupenum.r rename test/unittest/types/{err.D_DECL_IDRED.dupenum.d => err.dupenum.d} (74%) create mode 100644 test/unittest/types/err.dupenum.r rename test/unittest/types/{err.D_DECL_IDRED.dupenum.r.p => err.dupenum.r.p} (100%)test/unittest/enum/err.D_DECL_IDRED.RepeatIdentifiers.r deleted +0
-2@@ -1,2 +0,0 @@ --- @@stderr -- -dtrace: failed to compile script test/unittest/enum/err.D_DECL_IDRED.RepeatIdentifiers.d: [D_DECL_IDRED] line 24: identifier redeclared: GREENtest/unittest/enum/err.RepeatIdentifiers.d renamed from test/unittest/enum/err.D_DECL_IDRED.RepeatIdentifiers.d +3
-4@@ -1,6 +1,6 @@ /* * Oracle Linux DTrace. - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved. * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. */@@ -11,11 +11,10 @@ * error. * * SECTION: Type and Constant Definitions/Enumerations - * - * NOTES: - * */ +/* @@runtest-opts: -xerrtags */ + #pragma D option quiet enum colors {test/unittest/enum/err.RepeatIdentifiers.r new file +2
-0@@ -0,0 +1,2 @@ +-- @@stderr -- +dtrace: failed to compile script test/unittest/enum/err.RepeatIdentifiers.d: expected errortest/unittest/enum/err.RepeatIdentifiers.r.p renamed from test/unittest/enum/err.D_DECL_IDRED.RepeatIdentifiers.r.p +0
-0test/unittest/types/err.D_DECL_IDRED.dupenum.r deleted +0
-2@@ -1,2 +0,0 @@ --- @@stderr -- -dtrace: failed to compile script test/unittest/types/err.D_DECL_IDRED.dupenum.d: [D_DECL_IDRED] line 18: identifier redeclared: xtest/unittest/types/err.dupenum.d renamed from test/unittest/types/err.D_DECL_IDRED.dupenum.d +3
-1@@ -1,6 +1,6 @@ /* * Oracle Linux DTrace. - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved. * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. */@@ -12,6 +12,8 @@ * SECTION: Type and Constant Definitions/Enumerations */ +/* @@runtest-opts: -xerrtags */ + enum foo { x = 3, x = 4test/unittest/types/err.dupenum.r new file +2
-0@@ -0,0 +1,2 @@ +-- @@stderr -- +dtrace: failed to compile script test/unittest/types/err.dupenum.d: expected errortest/unittest/types/err.dupenum.r.p renamed from test/unittest/types/err.D_DECL_IDRED.dupenum.r.p +0
-0test/utils/libctf.r.p +19
-0@@ -1,7 +1,26 @@ #!/usr/bin/gawk -f # Licensed under the Universal Permissive License v 1.0 as shown at # http://oss.oracle.com/licenses/upl. + +# Possible "enumerator" label. +/Duplicate member, enumerator, or variable name/ { + sub(/member, enumerator, or variable/, "member or variable"); +} + +# Possible trailing '.'. /Duplicate member or variable name\.$/ { sub(/\.$/, ""); } /Member name not found\.$/ { sub(/\.$/, ""); } + +# Could be union or struct. /enum union pirate:/ { sub(/enum union pirate/, "enum struct pirate"); } + +# Older or newer libctf diags. +/\[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$/ { + sub(/\[D_UNKNOWN\] line [1-9][0-9]*: .*$/, "expected error"); +} + +# Print. { print; }Signature · 1 line
2.47.3