Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests/usr.bin/xlint tests/lint: replace 'expect' comments wi...
details: https://anonhg.NetBSD.org/src/rev/d722c602459d
branches: trunk
changeset: 366799:d722c602459d
user: rillig <rillig%NetBSD.org@localhost>
date: Wed Jun 15 20:18:31 2022 +0000
description:
tests/lint: replace 'expect' comments with 'expect+-' comments
The 'expect+-' comments provide more context, which makes it easier to
read the .c files on their own, without having to look up the actual
diagnostics in the .exp files.
Add tests for messages 105 and 106, which were about the obscure feature
of some traditional C compilers that allowed the expression 'x->member'
to access a struct member, even if 'x' had integer type.
The remaining tests will be migrated in a future commit.
diffstat:
tests/usr.bin/xlint/check-expect.lua | 9 ++++-
tests/usr.bin/xlint/lint1/msg_000.c | 8 ++-
tests/usr.bin/xlint/lint1/msg_000.exp | 4 +-
tests/usr.bin/xlint/lint1/msg_003.c | 11 ++++--
tests/usr.bin/xlint/lint1/msg_003.exp | 6 +-
tests/usr.bin/xlint/lint1/msg_004.c | 12 ++++--
tests/usr.bin/xlint/lint1/msg_004.exp | 8 ++--
tests/usr.bin/xlint/lint1/msg_006.c | 6 ++-
tests/usr.bin/xlint/lint1/msg_006.exp | 4 +-
tests/usr.bin/xlint/lint1/msg_008.c | 5 +-
tests/usr.bin/xlint/lint1/msg_008.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_009.c | 14 +++++--
tests/usr.bin/xlint/lint1/msg_009.exp | 4 +-
tests/usr.bin/xlint/lint1/msg_019.c | 16 ++++++--
tests/usr.bin/xlint/lint1/msg_019.exp | 12 +++---
tests/usr.bin/xlint/lint1/msg_029.c | 5 +-
tests/usr.bin/xlint/lint1/msg_029.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_031.c | 5 +-
tests/usr.bin/xlint/lint1/msg_031.exp | 6 +-
tests/usr.bin/xlint/lint1/msg_035.c | 60 ++++++++++++++++++++++++----------
tests/usr.bin/xlint/lint1/msg_035.exp | 38 +++++++++++-----------
tests/usr.bin/xlint/lint1/msg_036.c | 8 ++-
tests/usr.bin/xlint/lint1/msg_036.exp | 4 +-
tests/usr.bin/xlint/lint1/msg_037.c | 5 +-
tests/usr.bin/xlint/lint1/msg_037.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_050.c | 8 ++-
tests/usr.bin/xlint/lint1/msg_050.exp | 4 +-
tests/usr.bin/xlint/lint1/msg_051.c | 10 ++++-
tests/usr.bin/xlint/lint1/msg_051.exp | 8 ++--
tests/usr.bin/xlint/lint1/msg_055.c | 5 +-
tests/usr.bin/xlint/lint1/msg_056.c | 8 ++-
tests/usr.bin/xlint/lint1/msg_056.exp | 4 +-
tests/usr.bin/xlint/lint1/msg_057.c | 20 +++++++++--
tests/usr.bin/xlint/lint1/msg_057.exp | 12 +++---
tests/usr.bin/xlint/lint1/msg_060.c | 12 +++++-
tests/usr.bin/xlint/lint1/msg_060.exp | 8 ++--
tests/usr.bin/xlint/lint1/msg_061.c | 5 +-
tests/usr.bin/xlint/lint1/msg_061.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_068.c | 5 +-
tests/usr.bin/xlint/lint1/msg_068.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_071.c | 6 ++-
tests/usr.bin/xlint/lint1/msg_071.exp | 4 +-
tests/usr.bin/xlint/lint1/msg_073.c | 5 +-
tests/usr.bin/xlint/lint1/msg_073.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_074.c | 11 ++++-
tests/usr.bin/xlint/lint1/msg_074.exp | 4 +-
tests/usr.bin/xlint/lint1/msg_075.c | 5 +-
tests/usr.bin/xlint/lint1/msg_075.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_076.c | 5 +-
tests/usr.bin/xlint/lint1/msg_076.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_077.c | 5 +-
tests/usr.bin/xlint/lint1/msg_077.exp | 4 +-
tests/usr.bin/xlint/lint1/msg_081.c | 5 +-
tests/usr.bin/xlint/lint1/msg_081.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_082.c | 5 +-
tests/usr.bin/xlint/lint1/msg_082.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_083.c | 5 +-
tests/usr.bin/xlint/lint1/msg_083.exp | 4 +-
tests/usr.bin/xlint/lint1/msg_085.c | 14 +++++--
tests/usr.bin/xlint/lint1/msg_085.exp | 8 ++--
tests/usr.bin/xlint/lint1/msg_086.c | 5 +-
tests/usr.bin/xlint/lint1/msg_086.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_087.c | 5 +-
tests/usr.bin/xlint/lint1/msg_087.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_088.c | 5 +-
tests/usr.bin/xlint/lint1/msg_088.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_089.c | 8 ++-
tests/usr.bin/xlint/lint1/msg_089.exp | 2 +-
tests/usr.bin/xlint/lint1/msg_100.c | 10 +++--
tests/usr.bin/xlint/lint1/msg_100.exp | 3 +-
tests/usr.bin/xlint/lint1/msg_105.c | 47 +++++++++++++++++++++++++--
tests/usr.bin/xlint/lint1/msg_105.exp | 3 +-
tests/usr.bin/xlint/lint1/msg_106.c | 16 +++++++-
tests/usr.bin/xlint/lint1/msg_106.exp | 2 +-
74 files changed, 370 insertions(+), 211 deletions(-)
diffs (truncated from 1155 to 300 lines):
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/check-expect.lua
--- a/tests/usr.bin/xlint/check-expect.lua Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/check-expect.lua Wed Jun 15 20:18:31 2022 +0000
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: check-expect.lua,v 1.14 2021/12/07 07:09:12 rillig Exp $
+-- $NetBSD: check-expect.lua,v 1.15 2022/06/15 20:18:31 rillig Exp $
--[[
@@ -60,8 +60,13 @@
add_expectation(tonumber(offset), comment)
end
+ -- TODO: Remove these comments for all tests, as they often contain
+ -- only the raw message ID, without the actual message text,
+ -- which makes them harder to understand without looking up more context.
for comment in line:gmatch("/%* expect: (.-) %*/") do
- add_expectation(0, comment)
+ if not (fname:match("^msg_[0]")) then
+ add_expectation(0, comment)
+ end
end
pp_lineno = pp_lineno + 1
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_000.c
--- a/tests/usr.bin/xlint/lint1/msg_000.c Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_000.c Wed Jun 15 20:18:31 2022 +0000
@@ -1,10 +1,12 @@
-/* $NetBSD: msg_000.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_000.c,v 1.4 2022/06/15 20:18:31 rillig Exp $ */
# 3 "msg_000.c"
// Test for message: empty declaration [0]
extern int extern_declared;
-; /* expect: 0 */
+/* expect+1: warning: empty declaration [0] */
+;
-static int local_defined; /* expect: 226 */
+/* expect+1: warning: static variable 'local_defined' unused [226] */
+static int local_defined;
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_000.exp
--- a/tests/usr.bin/xlint/lint1/msg_000.exp Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_000.exp Wed Jun 15 20:18:31 2022 +0000
@@ -1,2 +1,2 @@
-msg_000.c(8): warning: empty declaration [0]
-msg_000.c(10): warning: static variable 'local_defined' unused [226]
+msg_000.c(9): warning: empty declaration [0]
+msg_000.c(12): warning: static variable 'local_defined' unused [226]
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_003.c
--- a/tests/usr.bin/xlint/lint1/msg_003.c Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_003.c Wed Jun 15 20:18:31 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_003.c,v 1.4 2021/02/28 12:40:00 rillig Exp $ */
+/* $NetBSD: msg_003.c,v 1.5 2022/06/15 20:18:31 rillig Exp $ */
# 3 "msg_003.c"
// Test for message: '%s' declared in argument declaration list [3]
@@ -6,8 +6,11 @@
/*ARGSUSED*/
void
example(declare_struct, declare_union, declare_enum)
- struct struct_in_argument *declare_struct; /* expect: 3 */
- union union_in_argument *declare_union; /* expect: 3 */
- enum enum_in_argument *declare_enum; /* expect: 3 */
+ /* expect+1: warning: 'incomplete struct struct_in_argument' declared in argument declaration list [3] */
+ struct struct_in_argument *declare_struct;
+ /* expect+1: warning: 'incomplete union union_in_argument' declared in argument declaration list [3] */
+ union union_in_argument *declare_union;
+ /* expect+1: warning: 'enum enum_in_argument' declared in argument declaration list [3] */
+ enum enum_in_argument *declare_enum;
{
}
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_003.exp
--- a/tests/usr.bin/xlint/lint1/msg_003.exp Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_003.exp Wed Jun 15 20:18:31 2022 +0000
@@ -1,3 +1,3 @@
-msg_003.c(9): warning: 'incomplete struct struct_in_argument' declared in argument declaration list [3]
-msg_003.c(10): warning: 'incomplete union union_in_argument' declared in argument declaration list [3]
-msg_003.c(11): warning: 'enum enum_in_argument' declared in argument declaration list [3]
+msg_003.c(10): warning: 'incomplete struct struct_in_argument' declared in argument declaration list [3]
+msg_003.c(12): warning: 'incomplete union union_in_argument' declared in argument declaration list [3]
+msg_003.c(14): warning: 'enum enum_in_argument' declared in argument declaration list [3]
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_004.c
--- a/tests/usr.bin/xlint/lint1/msg_004.c Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_004.c Wed Jun 15 20:18:31 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_004.c,v 1.5 2021/07/04 13:32:35 rillig Exp $ */
+/* $NetBSD: msg_004.c,v 1.6 2022/06/15 20:18:31 rillig Exp $ */
# 3 "msg_004.c"
// Test for message: illegal type combination [4]
@@ -10,12 +10,16 @@
double ok_double;
float _Complex ok_float_complex;
-int _Complex illegal_int_complex; /* expect: 4 *//* expect: 308 */
+/* expect+2: error: invalid type for _Complex [308] */
+/* expect+1: error: illegal type combination [4] */
+int _Complex illegal_int_complex;
char enum {
CHAR
-}; /* expect: 4 */
+};
+/* expect-1: error: illegal type combination [4] */
long struct {
int member;
-}; /* expect: 4 */
+};
+/* expect-1: error: illegal type combination [4] */
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_004.exp
--- a/tests/usr.bin/xlint/lint1/msg_004.exp Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_004.exp Wed Jun 15 20:18:31 2022 +0000
@@ -1,4 +1,4 @@
-msg_004.c(13): error: invalid type for _Complex [308]
-msg_004.c(13): error: illegal type combination [4]
-msg_004.c(17): error: illegal type combination [4]
-msg_004.c(21): error: illegal type combination [4]
+msg_004.c(15): error: invalid type for _Complex [308]
+msg_004.c(15): error: illegal type combination [4]
+msg_004.c(19): error: illegal type combination [4]
+msg_004.c(24): error: illegal type combination [4]
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_006.c
--- a/tests/usr.bin/xlint/lint1/msg_006.c Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_006.c Wed Jun 15 20:18:31 2022 +0000
@@ -1,7 +1,9 @@
-/* $NetBSD: msg_006.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
+/* $NetBSD: msg_006.c,v 1.5 2022/06/15 20:18:31 rillig Exp $ */
# 3 "msg_006.c"
// Test for message: use 'double' instead of 'long float' [6]
-long float x; /* expect: 6 *//* expect: 4 */
+/* expect+2: warning: use 'double' instead of 'long float' [6] */
+/* expect+1: error: illegal type combination [4] */
+long float x;
double x;
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_006.exp
--- a/tests/usr.bin/xlint/lint1/msg_006.exp Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_006.exp Wed Jun 15 20:18:31 2022 +0000
@@ -1,2 +1,2 @@
-msg_006.c(6): warning: use 'double' instead of 'long float' [6]
-msg_006.c(6): error: illegal type combination [4]
+msg_006.c(8): warning: use 'double' instead of 'long float' [6]
+msg_006.c(8): error: illegal type combination [4]
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_008.c
--- a/tests/usr.bin/xlint/lint1/msg_008.c Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_008.c Wed Jun 15 20:18:31 2022 +0000
@@ -1,9 +1,10 @@
-/* $NetBSD: msg_008.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_008.c,v 1.4 2022/06/15 20:18:31 rillig Exp $ */
# 3 "msg_008.c"
// Test for message: illegal storage class [8]
typedef void
example(void)
-{ /* expect: 8 */
+/* expect+1: error: illegal storage class [8] */
+{
}
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_008.exp
--- a/tests/usr.bin/xlint/lint1/msg_008.exp Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_008.exp Wed Jun 15 20:18:31 2022 +0000
@@ -1,1 +1,1 @@
-msg_008.c(8): error: illegal storage class [8]
+msg_008.c(9): error: illegal storage class [8]
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_009.c
--- a/tests/usr.bin/xlint/lint1/msg_009.c Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_009.c Wed Jun 15 20:18:31 2022 +0000
@@ -1,9 +1,13 @@
-/* $NetBSD: msg_009.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_009.c,v 1.4 2022/06/15 20:18:31 rillig Exp $ */
# 3 "msg_009.c"
// Test for message: only register valid as formal parameter storage class [9]
-extern void typedef_example(typedef int param); /* expect: 9 */
-extern void auto_example(auto int param); /* expect: 9 */
-extern void static_example(static int param); /* expect: 9 */
-extern void extern_example(extern int param); /* expect: 9 */
+/* expect+1: error: only register valid as formal parameter storage class [9] */
+extern void typedef_example(typedef int param);
+/* expect+1: error: only register valid as formal parameter storage class [9] */
+extern void auto_example(auto int param);
+/* expect+1: error: only register valid as formal parameter storage class [9] */
+extern void static_example(static int param);
+/* expect+1: error: only register valid as formal parameter storage class [9] */
+extern void extern_example(extern int param);
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_009.exp
--- a/tests/usr.bin/xlint/lint1/msg_009.exp Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_009.exp Wed Jun 15 20:18:31 2022 +0000
@@ -1,4 +1,4 @@
-msg_009.c(6): error: only register valid as formal parameter storage class [9]
msg_009.c(7): error: only register valid as formal parameter storage class [9]
-msg_009.c(8): error: only register valid as formal parameter storage class [9]
msg_009.c(9): error: only register valid as formal parameter storage class [9]
+msg_009.c(11): error: only register valid as formal parameter storage class [9]
+msg_009.c(13): error: only register valid as formal parameter storage class [9]
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_019.c
--- a/tests/usr.bin/xlint/lint1/msg_019.c Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_019.c Wed Jun 15 20:18:31 2022 +0000
@@ -1,14 +1,20 @@
-/* $NetBSD: msg_019.c,v 1.4 2021/04/05 01:35:34 rillig Exp $ */
+/* $NetBSD: msg_019.c,v 1.5 2022/06/15 20:18:31 rillig Exp $ */
# 3 "msg_019.c"
// Test for message: void type for '%s' [19]
-void global_variable; /* expect: 19 */
+/* expect+1: error: void type for 'global_variable' [19] */
+void global_variable;
-static void unit_variable; /* expect: 19 *//* expect: 226 */
+/* expect+2: error: void type for 'unit_variable' [19] */
+/* expect+1: warning: static variable 'unit_variable' unused [226] */
+static void unit_variable;
+/* expect+3: warning: argument 'parameter' unused in function 'function' [231] */
+/* expect+2: error: void parameter cannot have name: parameter [61] */
void
-function(void parameter) /* expect: 61 *//* expect: 231 */
+function(void parameter)
{
- void local_variable; /* expect: 19 */
+ /* expect+1: error: void type for 'local_variable' [19] */
+ void local_variable;
}
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_019.exp
--- a/tests/usr.bin/xlint/lint1/msg_019.exp Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_019.exp Wed Jun 15 20:18:31 2022 +0000
@@ -1,6 +1,6 @@
-msg_019.c(6): error: void type for 'global_variable' [19]
-msg_019.c(8): error: void type for 'unit_variable' [19]
-msg_019.c(11): error: void parameter cannot have name: parameter [61]
-msg_019.c(13): error: void type for 'local_variable' [19]
-msg_019.c(11): warning: argument 'parameter' unused in function 'function' [231]
-msg_019.c(8): warning: static variable 'unit_variable' unused [226]
+msg_019.c(7): error: void type for 'global_variable' [19]
+msg_019.c(11): error: void type for 'unit_variable' [19]
+msg_019.c(16): error: void parameter cannot have name: parameter [61]
+msg_019.c(19): error: void type for 'local_variable' [19]
+msg_019.c(16): warning: argument 'parameter' unused in function 'function' [231]
+msg_019.c(11): warning: static variable 'unit_variable' unused [226]
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_029.c
--- a/tests/usr.bin/xlint/lint1/msg_029.c Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_029.c Wed Jun 15 20:18:31 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_029.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_029.c,v 1.4 2022/06/15 20:18:31 rillig Exp $ */
# 3 "msg_029.c"
// Test for message: previously declared extern, becomes static: %s [29]
@@ -6,6 +6,7 @@
extern int function(void);
static int function(void)
-{ /* expect: 29 */
+/* expect+1: warning: previously declared extern, becomes static: function [29] */
+{
return function();
}
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_029.exp
--- a/tests/usr.bin/xlint/lint1/msg_029.exp Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_029.exp Wed Jun 15 20:18:31 2022 +0000
@@ -1,1 +1,1 @@
-msg_029.c(9): warning: previously declared extern, becomes static: function [29]
+msg_029.c(10): warning: previously declared extern, becomes static: function [29]
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_031.c
--- a/tests/usr.bin/xlint/lint1/msg_031.c Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_031.c Wed Jun 15 20:18:31 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_031.c,v 1.6 2021/07/13 22:01:34 rillig Exp $ */
+/* $NetBSD: msg_031.c,v 1.7 2022/06/15 20:18:31 rillig Exp $ */
# 3 "msg_031.c"
// Test for message: '%s' has incomplete type '%s' [31]
@@ -7,7 +7,8 @@
int dummy;
};
-struct incomplete; /* expect: 233 */
+/* expect+1: warning: struct 'incomplete' never defined [233] */
+struct incomplete;
struct complete complete_var;
diff -r dc5ce10ad27c -r d722c602459d tests/usr.bin/xlint/lint1/msg_031.exp
--- a/tests/usr.bin/xlint/lint1/msg_031.exp Wed Jun 15 18:44:41 2022 +0000
+++ b/tests/usr.bin/xlint/lint1/msg_031.exp Wed Jun 15 20:18:31 2022 +0000
@@ -1,3 +1,3 @@
-msg_031.c(20): error: '<unnamed>' has incomplete type 'incomplete struct incomplete' [31]
-msg_031.c(10): warning: struct 'incomplete' never defined [233]
-msg_031.c(16): error: 'incomplete_var' has incomplete type 'incomplete struct incomplete' [31]
+msg_031.c(21): error: '<unnamed>' has incomplete type 'incomplete struct incomplete' [31]
Home |
Main Index |
Thread Index |
Old Index