Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/usr.bin/indent tests/indent: condense the token tests



details:   https://anonhg.NetBSD.org/src/rev/12e678cc08ba
branches:  trunk
changeset: 989887:12e678cc08ba
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Oct 18 22:30:34 2021 +0000

description:
tests/indent: condense the token tests

This reduces the number of files in the test directory. It also allows
the tests to be read from top to bottom, looking at only a single file.

Since t_options.awk complains about files that don't have any test case
at all, add some test for each token kind. Most of the tests had
previously been effectively empty.

diffstat:

 distrib/sets/lists/tests/mi                                   |  218 +++---
 tests/usr.bin/indent/Makefile                                 |  146 +---
 tests/usr.bin/indent/token-binary_op.0                        |  110 ---
 tests/usr.bin/indent/token-binary_op.0.pro                    |    4 -
 tests/usr.bin/indent/token-binary_op.0.stdout                 |  113 ---
 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                            |   34 -
 tests/usr.bin/indent/token-colon.0.pro                        |    8 -
 tests/usr.bin/indent/token-colon.0.stdout                     |   41 -
 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-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-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                     |   29 -
 tests/usr.bin/indent/token-keyword_else.0.pro                 |    8 -
 tests/usr.bin/indent/token-keyword_else.0.stdout              |   29 -
 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                           |   45 -
 tests/usr.bin/indent/token-lparen.0.pro                       |    4 -
 tests/usr.bin/indent/token-lparen.0.stdout                    |   50 -
 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                    |   94 --
 tests/usr.bin/indent/token-preprocessing.0.pro                |    8 -
 tests/usr.bin/indent/token-preprocessing.0.stdout             |   95 --
 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                       |    9 -
 tests/usr.bin/indent/token-while_expr.0.pro                   |    8 -
 tests/usr.bin/indent/token-while_expr.0.stdout                |   23 -
 tests/usr.bin/indent/token_binary_op.c                        |  220 ++++++
 tests/usr.bin/indent/token_case_label.c                       |   47 +
 tests/usr.bin/indent/token_colon.c                            |   72 ++
 tests/usr.bin/indent/token_comma.c                            |   59 +
 tests/usr.bin/indent/token_comment.c                          |  326 +++++++++-
 tests/usr.bin/indent/token_decl.c                             |   32 +
 tests/usr.bin/indent/token_do_stmt.c                          |   30 +
 tests/usr.bin/indent/token_end_of_file.c                      |   17 +
 tests/usr.bin/indent/token_for_exprs.c                        |   58 +
 tests/usr.bin/indent/token_form_feed.c                        |   14 +
 tests/usr.bin/indent/token_funcname.c                         |   18 +
 tests/usr.bin/indent/token_if_expr.c                          |   21 +
 tests/usr.bin/indent/token_if_expr_stmt.c                     |   26 +
 tests/usr.bin/indent/token_if_expr_stmt_else.c                |   22 +
 tests/usr.bin/indent/token_keyword_do.c                       |   25 +
 tests/usr.bin/indent/token_keyword_do_else.c                  |   31 +
 tests/usr.bin/indent/token_keyword_else.c                     |   47 +
 tests/usr.bin/indent/token_keyword_for_if_while.c             |   36 +
 tests/usr.bin/indent/token_keyword_struct_union_enum.c        |   23 +
 tests/usr.bin/indent/token_lbrace.c                           |   26 +
 tests/usr.bin/indent/token_lparen.c                           |   94 ++
 tests/usr.bin/indent/token_newline.c                          |   30 +
 tests/usr.bin/indent/token_period.c                           |   33 +
 tests/usr.bin/indent/token_postfix_op.c                       |   19 +
 tests/usr.bin/indent/token_preprocessing.c                    |  183 +++++
 tests/usr.bin/indent/token_question.c                         |   14 +
 tests/usr.bin/indent/token_rbrace.c                           |   17 +
 tests/usr.bin/indent/token_rparen.c                           |   18 +
 tests/usr.bin/indent/token_semicolon.c                        |   43 +
 tests/usr.bin/indent/token_stmt.c                             |   26 +
 tests/usr.bin/indent/token_stmt_list.c                        |   26 +
 tests/usr.bin/indent/token_storage_class.c                    |   14 +
 tests/usr.bin/indent/token_string_prefix.c                    |   18 +
 tests/usr.bin/indent/token_switch_expr.c                      |   17 +
 tests/usr.bin/indent/token_type_def.c                         |   16 +
 tests/usr.bin/indent/token_unary_op.c                         |   22 +
 tests/usr.bin/indent/token_while_expr.c                       |   30 +
 147 files changed, 1915 insertions(+), 1773 deletions(-)

diffs (truncated from 4314 to 300 lines):

diff -r 07a51b1b1fd4 -r 12e678cc08ba distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Mon Oct 18 20:18:00 2021 +0000
+++ b/distrib/sets/lists/tests/mi       Mon Oct 18 22:30:34 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1144 2021/10/18 20:18:00 rillig Exp $
+# $NetBSD: mi,v 1.1145 2021/10/18 22:30:34 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5036,120 +5036,120 @@
 ./usr/tests/usr.bin/indent/t_misc                                      tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/indent/t_options                                   tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/indent/t_options.awk                               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-binary_op.0                           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-binary_op.0.pro                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-binary_op.0.stdout                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-case_label.0                          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-case_label.0.pro                      tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-case_label.0.stdout                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-colon.0                               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-colon.0.pro                           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-colon.0.stdout                                tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-comma.0                               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-comma.0.pro                           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-comma.0.stdout                                tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/token-binary_op.0                           tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-binary_op.0.pro                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-binary_op.0.stdout                    tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-case_label.0                          tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-case_label.0.pro                      tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-case_label.0.stdout                   tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-colon.0                               tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-colon.0.pro                           tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-colon.0.stdout                                tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-comma.0                               tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-comma.0.pro                           tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-comma.0.stdout                                tests-obsolete          obsolete,atf
 ./usr/tests/usr.bin/indent/token-comment.0                             tests-obsolete          obsolete,atf
 ./usr/tests/usr.bin/indent/token-comment.0.pro                         tests-obsolete          obsolete,atf
 ./usr/tests/usr.bin/indent/token-comment.0.stdout                      tests-obsolete          obsolete,atf
-./usr/tests/usr.bin/indent/token-decl.0                                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-decl.0.pro                            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-decl.0.stdout                         tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-do_stmt.0                             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-do_stmt.0.pro                         tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-do_stmt.0.stdout                      tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-end_of_file.0                         tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-end_of_file.0.pro                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-end_of_file.0.stdout                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-for_exprs.0                           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-for_exprs.0.pro                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-for_exprs.0.stdout                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-form_feed.0                           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-form_feed.0.pro                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-form_feed.0.stdout                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-funcname.0                            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-funcname.0.pro                                tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-funcname.0.stdout                     tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/token-decl.0                                        tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-decl.0.pro                            tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-decl.0.stdout                         tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-do_stmt.0                             tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-do_stmt.0.pro                         tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-do_stmt.0.stdout                      tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-end_of_file.0                         tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-end_of_file.0.pro                     tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-end_of_file.0.stdout                  tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-for_exprs.0                           tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-for_exprs.0.pro                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-for_exprs.0.stdout                    tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-form_feed.0                           tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-form_feed.0.pro                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-form_feed.0.stdout                    tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-funcname.0                            tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-funcname.0.pro                                tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-funcname.0.stdout                     tests-obsolete          obsolete,atf
 ./usr/tests/usr.bin/indent/token-ident.0                               tests-obsolete          obsolete,atf
 ./usr/tests/usr.bin/indent/token-ident.0.pro                           tests-obsolete          obsolete,atf
 ./usr/tests/usr.bin/indent/token-ident.0.stdout                                tests-obsolete          obsolete,atf
-./usr/tests/usr.bin/indent/token-if_expr.0                             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-if_expr.0.pro                         tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-if_expr.0.stdout                      tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-if_expr_stmt.0                                tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-if_expr_stmt.0.pro                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-if_expr_stmt.0.stdout                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-if_expr_stmt_else.0                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-if_expr_stmt_else.0.pro               tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-if_expr_stmt_else.0.stdout            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_do.0                          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_do.0.pro                      tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_do.0.stdout                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_do_else.0                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_do_else.0.pro                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_do_else.0.stdout              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_else.0                                tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_else.0.pro                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_else.0.stdout                 tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_for_if_while.0                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_for_if_while.0.pro            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_for_if_while.0.stdout         tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_struct_union_enum.0           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_struct_union_enum.0.pro       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-keyword_struct_union_enum.0.stdout    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-lbrace.0                              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-lbrace.0.pro                          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-lbrace.0.stdout                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-lparen.0                              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-lparen.0.pro                          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-lparen.0.stdout                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-newline.0                             tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-newline.0.pro                         tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-newline.0.stdout                      tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-period.0                              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-period.0.pro                          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-period.0.stdout                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-postfix_op.0                          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-postfix_op.0.pro                      tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-postfix_op.0.stdout                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-preprocessing.0                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-preprocessing.0.pro                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-preprocessing.0.stdout                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-question.0                            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-question.0.pro                                tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-question.0.stdout                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-rbrace.0                              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-rbrace.0.pro                          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-rbrace.0.stdout                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-rparen.0                              tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-rparen.0.pro                          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-rparen.0.stdout                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-semicolon.0                           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-semicolon.0.pro                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-semicolon.0.stdout                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-stmt.0                                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-stmt.0.pro                            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-stmt.0.stdout                         tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-stmt_list.0                           tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-stmt_list.0.pro                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-stmt_list.0.stdout                    tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-storage_class.0                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-storage_class.0.pro                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-storage_class.0.stdout                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-string_prefix.0                       tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-string_prefix.0.pro                   tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-string_prefix.0.stdout                        tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-switch_expr.0                         tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-switch_expr.0.pro                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-switch_expr.0.stdout                  tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-type_def.0                            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-type_def.0.pro                                tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-type_def.0.stdout                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-unary_op.0                            tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-unary_op.0.pro                                tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-unary_op.0.stdout                     tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-while_expr.0                          tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-while_expr.0.pro                      tests-usr.bin-tests     compattestfile,atf
-./usr/tests/usr.bin/indent/token-while_expr.0.stdout                   tests-usr.bin-tests     compattestfile,atf
+./usr/tests/usr.bin/indent/token-if_expr.0                             tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-if_expr.0.pro                         tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-if_expr.0.stdout                      tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt.0                                tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt.0.pro                    tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt.0.stdout                 tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt_else.0                   tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt_else.0.pro               tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-if_expr_stmt_else.0.stdout            tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_do.0                          tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_do.0.pro                      tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_do.0.stdout                   tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_do_else.0                     tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_do_else.0.pro                 tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_do_else.0.stdout              tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_else.0                                tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_else.0.pro                    tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_else.0.stdout                 tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_for_if_while.0                        tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_for_if_while.0.pro            tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_for_if_while.0.stdout         tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_struct_union_enum.0           tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_struct_union_enum.0.pro       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-keyword_struct_union_enum.0.stdout    tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-lbrace.0                              tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-lbrace.0.pro                          tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-lbrace.0.stdout                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-lparen.0                              tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-lparen.0.pro                          tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-lparen.0.stdout                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-newline.0                             tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-newline.0.pro                         tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-newline.0.stdout                      tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-period.0                              tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-period.0.pro                          tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-period.0.stdout                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-postfix_op.0                          tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-postfix_op.0.pro                      tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-postfix_op.0.stdout                   tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-preprocessing.0                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-preprocessing.0.pro                   tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-preprocessing.0.stdout                        tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-question.0                            tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-question.0.pro                                tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-question.0.stdout                     tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-rbrace.0                              tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-rbrace.0.pro                          tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-rbrace.0.stdout                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-rparen.0                              tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-rparen.0.pro                          tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-rparen.0.stdout                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-semicolon.0                           tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-semicolon.0.pro                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-semicolon.0.stdout                    tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-stmt.0                                        tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-stmt.0.pro                            tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-stmt.0.stdout                         tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-stmt_list.0                           tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-stmt_list.0.pro                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-stmt_list.0.stdout                    tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-storage_class.0                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-storage_class.0.pro                   tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-storage_class.0.stdout                        tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-string_prefix.0                       tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-string_prefix.0.pro                   tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-string_prefix.0.stdout                        tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-switch_expr.0                         tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-switch_expr.0.pro                     tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-switch_expr.0.stdout                  tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-type_def.0                            tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-type_def.0.pro                                tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-type_def.0.stdout                     tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-unary_op.0                            tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-unary_op.0.pro                                tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-unary_op.0.stdout                     tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-while_expr.0                          tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-while_expr.0.pro                      tests-obsolete          obsolete,atf
+./usr/tests/usr.bin/indent/token-while_expr.0.stdout                   tests-obsolete          obsolete,atf
 ./usr/tests/usr.bin/indent/token_comment.c                             tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/indent/token_ident.c                               tests-usr.bin-tests     compattestfile,atf
 ./usr/tests/usr.bin/indent/types_from_file.0                           tests-usr.bin-tests     compattestfile,atf
diff -r 07a51b1b1fd4 -r 12e678cc08ba tests/usr.bin/indent/Makefile
--- a/tests/usr.bin/indent/Makefile     Mon Oct 18 20:18:00 2021 +0000
+++ b/tests/usr.bin/indent/Makefile     Mon Oct 18 22:30:34 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2021/10/18 20:18:00 rillig Exp $
+#      $NetBSD: Makefile,v 1.20 2021/10/18 22:30:34 rillig Exp $
 
 .include <bsd.own.mk>
 
@@ -146,116 +146,44 @@
 FILES+=                surplusbad.0.stdout
 FILES+=                surplusbad.0.pro
 FILES+=                t_options.awk
-FILES+=                token-binary_op.0
-FILES+=                token-binary_op.0.pro
-FILES+=                token-binary_op.0.stdout
-FILES+=                token-case_label.0
-FILES+=                token-case_label.0.pro
-FILES+=                token-case_label.0.stdout
-FILES+=                token-colon.0
-FILES+=                token-colon.0.pro
-FILES+=                token-colon.0.stdout
-FILES+=                token-comma.0
-FILES+=                token-comma.0.pro
-FILES+=                token-comma.0.stdout
-FILES+=                token-decl.0
-FILES+=                token-decl.0.pro
-FILES+=                token-decl.0.stdout
-FILES+=                token-do_stmt.0
-FILES+=                token-do_stmt.0.pro
-FILES+=                token-do_stmt.0.stdout
-FILES+=                token-end_of_file.0
-FILES+=                token-end_of_file.0.pro
-FILES+=                token-end_of_file.0.stdout
-FILES+=                token-for_exprs.0
-FILES+=                token-for_exprs.0.pro
-FILES+=                token-for_exprs.0.stdout
-FILES+=                token-form_feed.0
-FILES+=                token-form_feed.0.pro
-FILES+=                token-form_feed.0.stdout
-FILES+=                token-funcname.0
-FILES+=                token-funcname.0.pro
-FILES+=                token-funcname.0.stdout
-FILES+=                token-if_expr.0
-FILES+=                token-if_expr.0.pro
-FILES+=                token-if_expr.0.stdout
-FILES+=                token-if_expr_stmt.0
-FILES+=                token-if_expr_stmt.0.pro
-FILES+=                token-if_expr_stmt.0.stdout
-FILES+=                token-if_expr_stmt_else.0
-FILES+=                token-if_expr_stmt_else.0.pro
-FILES+=                token-if_expr_stmt_else.0.stdout
-FILES+=                token-keyword_do.0
-FILES+=                token-keyword_do.0.pro
-FILES+=                token-keyword_do.0.stdout
-FILES+=                token-keyword_do_else.0
-FILES+=                token-keyword_do_else.0.pro
-FILES+=                token-keyword_do_else.0.stdout
-FILES+=                token-keyword_else.0
-FILES+=                token-keyword_else.0.pro
-FILES+=                token-keyword_else.0.stdout
-FILES+=                token-keyword_for_if_while.0



Home | Main Index | Thread Index | Old Index