Module Name: src
Committed By: rillig
Date: Sat Oct 23 20:01:14 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/indent: Makefile fmt_decl.c
Removed Files:
src/tests/usr.bin/indent: f_decls.0 f_decls.0.stdout
Log Message:
tests/indent: migrate f_decls to using t_options, add more tests
To generate a diff of this commit:
cvs rdiff -u -r1.1155 -r1.1156 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.27 -r1.28 src/tests/usr.bin/indent/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/usr.bin/indent/f_decls.0 \
src/tests/usr.bin/indent/f_decls.0.stdout
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/indent/fmt_decl.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.1155 src/distrib/sets/lists/tests/mi:1.1156
--- src/distrib/sets/lists/tests/mi:1.1155 Sat Oct 23 18:46:26 2021
+++ src/distrib/sets/lists/tests/mi Sat Oct 23 20:01:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1155 2021/10/23 18:46:26 thorpej Exp $
+# $NetBSD: mi,v 1.1156 2021/10/23 20:01:14 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4750,8 +4750,8 @@
./usr/tests/usr.bin/indent/elsecomment.0 tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/elsecomment.0.pro tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/elsecomment.0.stdout tests-obsolete obsolete,atf
-./usr/tests/usr.bin/indent/f_decls.0 tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/indent/f_decls.0.stdout tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/indent/f_decls.0 tests-obsolete obsolete,atf
+./usr/tests/usr.bin/indent/f_decls.0.stdout tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/float.0 tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/float.0.stdout tests-obsolete obsolete,atf
./usr/tests/usr.bin/indent/fmt_block.c tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/indent/Makefile
diff -u src/tests/usr.bin/indent/Makefile:1.27 src/tests/usr.bin/indent/Makefile:1.28
--- src/tests/usr.bin/indent/Makefile:1.27 Fri Oct 22 20:54:36 2021
+++ src/tests/usr.bin/indent/Makefile Sat Oct 23 20:01:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/10/22 20:54:36 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2021/10/23 20:01:14 rillig Exp $
.include <bsd.own.mk>
@@ -12,8 +12,6 @@ FILESDIR= ${TESTSDIR}
FILES= fmt_block.c
FILES+= fmt_decl.c
FILES+= fmt_else_comment.c
-FILES+= f_decls.0
-FILES+= f_decls.0.stdout
FILES+= indent_off_on.c
FILES+= label.c
FILES+= lex_ident.c
Index: src/tests/usr.bin/indent/fmt_decl.c
diff -u src/tests/usr.bin/indent/fmt_decl.c:1.1 src/tests/usr.bin/indent/fmt_decl.c:1.2
--- src/tests/usr.bin/indent/fmt_decl.c:1.1 Fri Oct 22 19:27:53 2021
+++ src/tests/usr.bin/indent/fmt_decl.c Sat Oct 23 20:01:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fmt_decl.c,v 1.1 2021/10/22 19:27:53 rillig Exp $ */
+/* $NetBSD: fmt_decl.c,v 1.2 2021/10/23 20:01:14 rillig Exp $ */
/* $FreeBSD: head/usr.bin/indent/tests/declarations.0 334478 2018-06-01 09:41:15Z pstef $ */
/* See FreeBSD r303570 */
@@ -147,7 +147,6 @@ _attribute_printf(1, 2)
void
print_error(const char *fmt,...)
{
-
}
#indent end
@@ -157,7 +156,39 @@ _attribute_printf(1, 2)
void
print_error(const char *fmt, ...)
{
+}
+#indent end
+
+
+#indent input
+static _attribute_printf(1, 2)
+void
+print_error(const char *fmt,...)
+{
+}
+#indent end
+#indent run
+static _attribute_printf(1, 2)
+void
+print_error(const char *fmt, ...)
+{
+}
+#indent end
+
+
+#indent input
+static void _attribute_printf(1, 2)
+print_error(const char *fmt,...)
+{
+}
+#indent end
+
+#indent run
+static void
+_attribute_printf(1, 2)
+print_error(const char *fmt, ...)
+{
}
#indent end
@@ -177,10 +208,10 @@ struct thread *ald_thread;
#indent input
static int
-do_execve(td, args, mac_p)
- struct thread *td;
- struct image_args *args;
- struct mac *mac_p;
+old_style_definition(a, b, c)
+ struct thread *a;
+ int b;
+ double ***c;
{
}
@@ -188,26 +219,16 @@ do_execve(td, args, mac_p)
#indent run
static int
-do_execve(td, args, mac_p)
- struct thread *td;
- struct image_args *args;
- struct mac *mac_p;
+old_style_definition(a, b, c)
+ struct thread *a;
+ int b;
+ double ***c;
{
}
#indent end
-#indent input
-int
-my_printf(const char *fmt, ...)
-{
-}
-#indent end
-
-#indent run-equals-input
-
-
/*
* Demonstrate how variable declarations are broken into several lines when
* the line length limit is set quite low.
@@ -260,3 +281,76 @@ struct s0123456789012 a,
struct s01234567890123 a,
b;
#indent end
+
+
+#indent input
+char * x(void)
+{
+ type identifier;
+ type *pointer;
+ unused * value;
+ (void)unused * value;
+
+ dmax = (double)3 * 10.0;
+ dmin = (double)dmax * 10.0;
+ davg = (double)dmax * dmin;
+
+ return NULL;
+}
+#indent end
+
+#indent run
+char *
+x(void)
+{
+ type identifier;
+ type *pointer;
+ unused *value;
+ (void)unused * value;
+
+ dmax = (double)3 * 10.0;
+ dmin = (double)dmax * 10.0;
+ davg = (double)dmax * dmin;
+
+ return NULL;
+}
+#indent end
+
+#indent input
+int *
+y(void) {
+
+}
+
+int
+z(void) {
+
+}
+#indent end
+
+#indent run
+int *
+y(void)
+{
+
+}
+
+int
+z(void)
+{
+
+}
+#indent end
+
+
+#indent input
+int x;
+int *y;
+int * * * * z;
+#indent end
+
+#indent run
+int x;
+int *y;
+int ****z;
+#indent end
