Module Name: src
Committed By: rillig
Date: Sun Jan 22 17:17:25 UTC 2023
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile d_c99_decls_after_stmt.c
Removed Files:
src/tests/usr.bin/xlint/lint1: d_c99_decls_after_stmt2.c
d_c99_decls_after_stmt3.c
Log Message:
tests/lint: merge tests for declaration after statement
To generate a diff of this commit:
cvs rdiff -u -r1.1246 -r1.1247 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.133 -r1.134 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c
cvs rdiff -u -r1.4 -r0 \
src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c \
src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1246 src/distrib/sets/lists/tests/mi:1.1247
--- src/distrib/sets/lists/tests/mi:1.1246 Sat Jan 21 13:07:21 2023
+++ src/distrib/sets/lists/tests/mi Sun Jan 22 17:17:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1246 2023/01/21 13:07:21 rillig Exp $
+# $NetBSD: mi,v 1.1247 2023/01/22 17:17:24 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6442,8 +6442,8 @@
./usr/tests/usr.bin/xlint/lint1/d_c99_complex_split.exp tests-obsolete obsolete,atf
./usr/tests/usr.bin/xlint/lint1/d_c99_compound_literal_comma.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c tests-obsolete obsolete,atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c tests-obsolete obsolete,atf
./usr/tests/usr.bin/xlint/lint1/d_c99_flex_array_packed.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_c99_for_loops.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_c99_func.c tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.133 src/tests/usr.bin/xlint/lint1/Makefile:1.134
--- src/tests/usr.bin/xlint/lint1/Makefile:1.133 Sat Jan 21 13:07:22 2023
+++ src/tests/usr.bin/xlint/lint1/Makefile Sun Jan 22 17:17:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2023/01/21 13:07:22 rillig Exp $
+# $NetBSD: Makefile,v 1.134 2023/01/22 17:17:25 rillig Exp $
NOMAN= # defined
MAX_MESSAGE= 350 # see lint1/err.c
@@ -36,8 +36,6 @@ FILES+= d_c99_complex_num.c
FILES+= d_c99_complex_split.c
FILES+= d_c99_compound_literal_comma.c
FILES+= d_c99_decls_after_stmt.c
-FILES+= d_c99_decls_after_stmt2.c
-FILES+= d_c99_decls_after_stmt3.c
FILES+= d_c99_flex_array_packed.c
FILES+= d_c99_for_loops.c
FILES+= d_c99_func.c
Index: src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c:1.4 src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c:1.5
--- src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c:1.4 Sat Feb 12 01:23:44 2022
+++ src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c Sun Jan 22 17:17:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_decls_after_stmt.c,v 1.4 2022/02/12 01:23:44 rillig Exp $ */
+/* $NetBSD: d_c99_decls_after_stmt.c,v 1.5 2023/01/22 17:17:25 rillig Exp $ */
# 3 "d_c99_decls_after_stmt.c"
/*
@@ -9,7 +9,7 @@
*/
void
-sample(void)
+two_groups_of_decl_plus_stmt(void)
{
int i = 0;
i += 1;
@@ -17,3 +17,26 @@ sample(void)
int j = 0;
j += 1;
}
+
+typedef int int_t;
+
+int
+second_decl_stmt_uses_a_typedef(void)
+{
+ int i = 0;
+ i += 1;
+
+ int_t j = 0;
+ j += 1;
+
+ return 0;
+}
+
+void
+function_with_argument(int i)
+{
+ i += 1;
+
+ int j = 0;
+ j += 1;
+}
