[src/trunk]: src/tests/usr.bin/indent tests/indent: add test templates for te...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/13e8044681f3
branches:  trunk
changeset: 960225:13e8044681f3
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Mar 12 00:13:06 2021 +0000

description:
tests/indent: add test templates for testing specific parser symbols

The basic idea of indent is to split the input into tokens and then
reassemble them, reformatting them on the way.  These tokens determine
how the output is formatted, therefore add tests for each of the
terminal tokens and nonterminal parser symbols, to cover more common
cases, and edge cases as well.

diffstat:

 distrib/sets/lists/tests/mi                                   |  652 +++++----
 tests/usr.bin/indent/Makefile                                 |  116 +-
 tests/usr.bin/indent/token-binary_op.0                        |   12 +
 tests/usr.bin/indent/token-binary_op.0.pro                    |    8 +
 tests/usr.bin/indent/token-binary_op.0.stdout                 |   12 +
 tests/usr.bin/indent/token-case_label.0                       |    8 +
 tests/usr.bin/indent/token-case_label.0.pro                   |    8 +
 tests/usr.bin/indent/token-case_label.0.stdout                |    8 +
 tests/usr.bin/indent/token-colon.0                            |   17 +
 tests/usr.bin/indent/token-colon.0.pro                        |    8 +
 tests/usr.bin/indent/token-colon.0.stdout                     |   17 +
 tests/usr.bin/indent/token-comma.0                            |   17 +
 tests/usr.bin/indent/token-comma.0.pro                        |    8 +
 tests/usr.bin/indent/token-comma.0.stdout                     |   17 +
 tests/usr.bin/indent/token-comment.0                          |   10 +
 tests/usr.bin/indent/token-comment.0.pro                      |    8 +
 tests/usr.bin/indent/token-comment.0.stdout                   |   10 +
 tests/usr.bin/indent/token-decl.0                             |   12 +
 tests/usr.bin/indent/token-decl.0.pro                         |    8 +
 tests/usr.bin/indent/token-decl.0.stdout                      |   12 +
 tests/usr.bin/indent/token-do_stmt.0                          |    8 +
 tests/usr.bin/indent/token-do_stmt.0.pro                      |    8 +
 tests/usr.bin/indent/token-do_stmt.0.stdout                   |    8 +
 tests/usr.bin/indent/token-end_of_file.0                      |    8 +
 tests/usr.bin/indent/token-end_of_file.0.pro                  |    8 +
 tests/usr.bin/indent/token-end_of_file.0.stdout               |    8 +
 tests/usr.bin/indent/token-for_exprs.0                        |   14 +
 tests/usr.bin/indent/token-for_exprs.0.pro                    |    8 +
 tests/usr.bin/indent/token-for_exprs.0.stdout                 |   14 +
 tests/usr.bin/indent/token-form_feed.0                        |    8 +
 tests/usr.bin/indent/token-form_feed.0.pro                    |    8 +
 tests/usr.bin/indent/token-form_feed.0.stdout                 |    8 +
 tests/usr.bin/indent/token-funcname.0                         |    8 +
 tests/usr.bin/indent/token-funcname.0.pro                     |    8 +
 tests/usr.bin/indent/token-funcname.0.stdout                  |    8 +
 tests/usr.bin/indent/token-ident.0                            |    8 +
 tests/usr.bin/indent/token-ident.0.pro                        |    8 +
 tests/usr.bin/indent/token-ident.0.stdout                     |    8 +
 tests/usr.bin/indent/token-if_expr.0                          |    8 +
 tests/usr.bin/indent/token-if_expr.0.pro                      |    8 +
 tests/usr.bin/indent/token-if_expr.0.stdout                   |    8 +
 tests/usr.bin/indent/token-if_expr_stmt.0                     |   13 +
 tests/usr.bin/indent/token-if_expr_stmt.0.pro                 |    8 +
 tests/usr.bin/indent/token-if_expr_stmt.0.stdout              |   13 +
 tests/usr.bin/indent/token-if_expr_stmt_else.0                |   11 +
 tests/usr.bin/indent/token-if_expr_stmt_else.0.pro            |    8 +
 tests/usr.bin/indent/token-if_expr_stmt_else.0.stdout         |   11 +
 tests/usr.bin/indent/token-keyword_do.0                       |    8 +
 tests/usr.bin/indent/token-keyword_do.0.pro                   |    8 +
 tests/usr.bin/indent/token-keyword_do.0.stdout                |    8 +
 tests/usr.bin/indent/token-keyword_do_else.0                  |   10 +
 tests/usr.bin/indent/token-keyword_do_else.0.pro              |    8 +
 tests/usr.bin/indent/token-keyword_do_else.0.stdout           |   10 +
 tests/usr.bin/indent/token-keyword_else.0                     |   12 +
 tests/usr.bin/indent/token-keyword_else.0.pro                 |    8 +
 tests/usr.bin/indent/token-keyword_else.0.stdout              |   12 +
 tests/usr.bin/indent/token-keyword_for_if_while.0             |   11 +
 tests/usr.bin/indent/token-keyword_for_if_while.0.pro         |    8 +
 tests/usr.bin/indent/token-keyword_for_if_while.0.stdout      |   11 +
 tests/usr.bin/indent/token-keyword_struct_union_enum.0        |    8 +
 tests/usr.bin/indent/token-keyword_struct_union_enum.0.pro    |    8 +
 tests/usr.bin/indent/token-keyword_struct_union_enum.0.stdout |    8 +
 tests/usr.bin/indent/token-lbrace.0                           |   15 +
 tests/usr.bin/indent/token-lbrace.0.pro                       |    8 +
 tests/usr.bin/indent/token-lbrace.0.stdout                    |   15 +
 tests/usr.bin/indent/token-lparen.0                           |   18 +
 tests/usr.bin/indent/token-lparen.0.pro                       |    8 +
 tests/usr.bin/indent/token-lparen.0.stdout                    |   18 +
 tests/usr.bin/indent/token-newline.0                          |   17 +
 tests/usr.bin/indent/token-newline.0.pro                      |    8 +
 tests/usr.bin/indent/token-newline.0.stdout                   |   17 +
 tests/usr.bin/indent/token-period.0                           |   12 +
 tests/usr.bin/indent/token-period.0.pro                       |    8 +
 tests/usr.bin/indent/token-period.0.stdout                    |   12 +
 tests/usr.bin/indent/token-postfix_op.0                       |    8 +
 tests/usr.bin/indent/token-postfix_op.0.pro                   |    8 +
 tests/usr.bin/indent/token-postfix_op.0.stdout                |    8 +
 tests/usr.bin/indent/token-preprocessing.0                    |   13 +
 tests/usr.bin/indent/token-preprocessing.0.pro                |    8 +
 tests/usr.bin/indent/token-preprocessing.0.stdout             |   13 +
 tests/usr.bin/indent/token-question.0                         |    8 +
 tests/usr.bin/indent/token-question.0.pro                     |    8 +
 tests/usr.bin/indent/token-question.0.stdout                  |    8 +
 tests/usr.bin/indent/token-rbrace.0                           |    8 +
 tests/usr.bin/indent/token-rbrace.0.pro                       |    8 +
 tests/usr.bin/indent/token-rbrace.0.stdout                    |    8 +
 tests/usr.bin/indent/token-rparen.0                           |    8 +
 tests/usr.bin/indent/token-rparen.0.pro                       |    8 +
 tests/usr.bin/indent/token-rparen.0.stdout                    |    8 +
 tests/usr.bin/indent/token-semicolon.0                        |   14 +
 tests/usr.bin/indent/token-semicolon.0.pro                    |    8 +
 tests/usr.bin/indent/token-semicolon.0.stdout                 |   14 +
 tests/usr.bin/indent/token-stmt.0                             |    8 +
 tests/usr.bin/indent/token-stmt.0.pro                         |    8 +
 tests/usr.bin/indent/token-stmt.0.stdout                      |    8 +
 tests/usr.bin/indent/token-stmt_list.0                        |   11 +
 tests/usr.bin/indent/token-stmt_list.0.pro                    |    8 +
 tests/usr.bin/indent/token-stmt_list.0.stdout                 |   11 +
 tests/usr.bin/indent/token-storage_class.0                    |    8 +
 tests/usr.bin/indent/token-storage_class.0.pro                |    8 +
 tests/usr.bin/indent/token-storage_class.0.stdout             |    8 +
 tests/usr.bin/indent/token-string_prefix.0                    |    8 +
 tests/usr.bin/indent/token-string_prefix.0.pro                |    8 +
 tests/usr.bin/indent/token-string_prefix.0.stdout             |    8 +
 tests/usr.bin/indent/token-switch_expr.0                      |    8 +
 tests/usr.bin/indent/token-switch_expr.0.pro                  |    8 +
 tests/usr.bin/indent/token-switch_expr.0.stdout               |    8 +
 tests/usr.bin/indent/token-type_def.0                         |    8 +
 tests/usr.bin/indent/token-type_def.0.pro                     |    8 +
 tests/usr.bin/indent/token-type_def.0.stdout                  |    8 +
 tests/usr.bin/indent/token-unary_op.0                         |    8 +
 tests/usr.bin/indent/token-unary_op.0.pro                     |    8 +
 tests/usr.bin/indent/token-unary_op.0.stdout                  |    8 +
 tests/usr.bin/indent/token-while_expr.0                       |    8 +
 tests/usr.bin/indent/token-while_expr.0.pro                   |    8 +
 tests/usr.bin/indent/token-while_expr.0.stdout                |    8 +
 116 files changed, 1600 insertions(+), 270 deletions(-)

diffs (truncated from 2354 to 300 lines):

diff -r 1718c6896033 -r 13e8044681f3 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Thu Mar 11 22:32:06 2021 +0000
+++ b/distrib/sets/lists/tests/mi       Fri Mar 12 00:13:06 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1030 2021/03/09 20:43:19 rillig Exp $
+# $NetBSD: mi,v 1.1031 2021/03/12 00:13:06 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -4704,274 +4704,388 @@
 ./usr/tests/usr.bin/id/t_id                            tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/id/t_whoami                                tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/indent                             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/Atffile                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/Kyuafile                    tests-usr.bin-tests     compattestfile,atf,kyua
-./usr/tests/usr.bin/indent/binary.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/binary.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/block.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/block.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/comment-line-end.0          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/comment-line-end.0.stdout   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/comments.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/comments.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/comments.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/cs.0                                tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/cs.0.pro                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/cs.0.stdout                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/declarations.0              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/declarations.0.stdout       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/elsecomment.0               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/elsecomment.0.pro           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/elsecomment.0.stdout                tests-usr.bin-tests     compattestfile,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/float.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/float.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/indent_variables.0          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/indent_variables.0.pro      tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/indent_variables.0.stdout   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/label.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/label.0.pro                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/label.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/lineno.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/lineno.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/lineno.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/list_head.0                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/list_head.0.stdout          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/ncs.0                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/ncs.0.pro                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/ncs.0.stdout                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/offsetof.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/offsetof.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt--version.0              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt--version.0.pro          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt--version.0.stdout       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-P.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-P.0.pro                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-P.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-T.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-T.0.pro                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-T.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-U.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-U.0.list                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-U.0.pro                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-U.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bacc.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bacc.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bacc.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bad.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bad.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bad.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-badp.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-badp.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-badp.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bap+sob.0               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bap+sob.0.pro           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bap+sob.0.stdout                tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bap.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bap.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bap.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bbb.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bbb.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bbb.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bc.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bc.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bc.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bl.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bl.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bl.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-br.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-br.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-br.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bs.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bs.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-bs.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-c.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-c.0.pro                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-c.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cd.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cd.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cd.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cdb.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cdb.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cdb.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ce.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ce.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ce.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ci.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ci.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ci.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cli.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cli.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cli.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cs.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cs.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-cs.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-d.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-d.0.pro                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-d.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-di.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-di.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-di.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-dj.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-dj.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-dj.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-eei.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-eei.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-eei.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ei.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ei.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ei.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-fbs.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-fbs.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-fbs.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-fc1.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-fc1.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-fc1.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-fcb.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-fcb.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-fcb.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-i.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-i.0.pro                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-i.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ip.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ip.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ip.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-l.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-l.0.pro                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-l.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-lc.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-lc.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-lc.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ldi.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ldi.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ldi.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-lp.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-lp.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-lp.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-lpl.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-lpl.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-lpl.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbacc.0                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbacc.0.pro             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbacc.0.stdout          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbad.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbad.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbad.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbadp.0                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbadp.0.pro             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbadp.0.stdout          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbap.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbap.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbap.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbbb.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbbb.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbbb.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbc.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbc.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbc.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbs.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbs.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nbs.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ncdb.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ncdb.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ncdb.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nce.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nce.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nce.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ncs.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ncs.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ncs.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ndj.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ndj.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ndj.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-neei.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-neei.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-neei.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nei.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nei.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nei.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nfbs.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nfbs.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nfbs.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nfc1.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nfc1.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nfc1.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nfcb.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nfcb.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nfcb.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nip.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nip.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nip.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nlp.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nlp.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nlp.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nlpl.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nlpl.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nlpl.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-npcs.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-npcs.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-npcs.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-npro.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-npro.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-npro.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-npsl.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-npsl.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-npsl.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nsc.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nsc.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nsc.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nsob.0                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nsob.0.pro              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nsob.0.stdout           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nut.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nut.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nut.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nv.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nv.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-nv.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-pcs.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-pcs.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-pcs.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-psl.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-psl.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-psl.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-sc.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-sc.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-sc.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-sob.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-sob.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-sob.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ta.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ta.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ta.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ts.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ts.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ts.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ut.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ut.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-ut.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-v.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-v.0.pro                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/opt-v.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/parens.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/parens.0.pro                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/parens.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/pcs.0                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/pcs.0.pro                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/pcs.0.stdout                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/struct.0                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/struct.0.stdout             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/surplusbad.0                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/surplusbad.0.pro            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/surplusbad.0.stdout         tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/t_indent                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/types_from_file.0           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/types_from_file.0.list      tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/types_from_file.0.pro       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/types_from_file.0.stdout    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/wchar.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/wchar.0.stdout              tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/Atffile                                     tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/Kyuafile                                    tests-usr.bin-tests     compattestfile,atf,kyua
+./usr/tests/usr.bin/indent/binary.0                                    tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/binary.0.stdout                             tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/block.0                                     tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/block.0.stdout                              tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/comment-line-end.0                          tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/comment-line-end.0.stdout                   tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/comments.0                                  tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/comments.0.pro                              tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/comments.0.stdout                           tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/cs.0                                                tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/cs.0.pro                                    tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/cs.0.stdout                                 tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/declarations.0                              tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/declarations.0.stdout                       tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/elsecomment.0                               tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/elsecomment.0.pro                           tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/elsecomment.0.stdout                                tests-usr.bin-tests     compattestfile,atf