From 022c184e86573cecc08e9a3ad58030e728c3a761 Mon Sep 17 00:00:00 2001
From: Guillaume Petiot <guillpetiot@gmail.com>
Date: Wed, 21 Aug 2019 14:12:13 +0700
Subject: [PATCH 1/5] Tests: remove symbolic links and change naming convention
 of tests

---
 ....ml.opts => align_cases-break_all.ml.opts} |  0
 ...ll.ml.ref => align_cases-break_all.ml.ref} |  0
 test/passing/align_cases_break_all.ml         |  1 -
 ...pts => assign_colon-op_begin_line.ml.opts} |  0
 ....ref => assign_colon-op_begin_line.ml.ref} |  0
 test/passing/assign_colon_op_begin_line.ml    |  1 -
 ...o.ml.opts => break_before_in-auto.ml.opts} |  0
 ...uto.ml.ref => break_before_in-auto.ml.ref} |  0
 ..._fit_or_vertical.ml => break_before_in.ml} |  0
 ...rtical.ml.opts => break_before_in.ml.opts} |  0
 test/passing/break_before_in_auto.ml          |  1 -
 ...lign.ml.opts => break_cases-align.ml.opts} |  0
 ..._align.ml.ref => break_cases-align.ml.ref} |  0
 ...es_all.ml.opts => break_cases-all.ml.opts} |  0
 ...ases_all.ml.ref => break_cases-all.ml.ref} |  0
 ...ak_cases-closing_on_separate_line.ml.opts} |  0
 ...eak_cases-closing_on_separate_line.ml.ref} |  0
 ..._line_leading_nested_match_parens.ml.opts} |  0
 ...e_line_leading_nested_match_parens.ml.ref} |  0
 ...pts => break_cases-cosl_lnmp_cmei.ml.opts} |  0
 ....ref => break_cases-cosl_lnmp_cmei.ml.ref} |  0
 ...ts => break_cases-fit_or_vertical.ml.opts} |  0
 ...ref => break_cases-fit_or_vertical.ml.ref} |  0
 ...ted.ml.opts => break_cases-nested.ml.opts} |  0
 ...ested.ml.ref => break_cases-nested.ml.ref} |  0
 ...opts => break_cases-normal_indent.ml.opts} |  0
 ...l.ref => break_cases-normal_indent.ml.ref} |  0
 ...l.ml.opts => break_cases-toplevel.ml.opts} |  0
 ...vel.ml.ref => break_cases-toplevel.ml.ref} |  0
 .../{break_cases_fit.ml => break_cases.ml}    |  0
 ..._cases_fit.ml.opts => break_cases.ml.opts} |  0
 ...ak_cases_fit.ml.ref => break_cases.ml.ref} |  0
 test/passing/break_cases_align.ml             |  1 -
 test/passing/break_cases_all.ml               |  1 -
 .../break_cases_closing_on_separate_line.ml   |  1 -
 ...parate_line_leading_nested_match_parens.ml |  1 -
 test/passing/break_cases_cosl_lnmp_cmei.ml    |  1 -
 test/passing/break_cases_fit_or_vertical.ml   |  1 -
 test/passing/break_cases_nested.ml            |  1 -
 test/passing/break_cases_normal_indent.ml     |  1 -
 test/passing/break_cases_toplevel.ml          |  1 -
 .../passing/break_fun_decl-fit_or_vertical.ml |  1 -
 test/passing/break_fun_decl-smart.ml          |  1 -
 test/passing/break_fun_decl-wrap.ml           |  1 -
 ...ml.opts => break_separators-after.ml.opts} |  0
 ...r.ml.ref => break_separators-after.ml.ref} |  0
 ... => break_separators-after_docked.ml.opts} |  0
 ...f => break_separators-after_docked.ml.ref} |  0
 ...reak_separators-after_docked_wrap.ml.opts} |  0
 ...break_separators-after_docked_wrap.ml.ref} |  0
 ...ts => break_separators-after_wrap.ml.opts} |  0
 ...ref => break_separators-after_wrap.ml.ref} |  0
 ....ml.opts => break_separators-wrap.ml.opts} |  0
 ...ap.ml.ref => break_separators-wrap.ml.ref} |  0
 test/passing/break_separators_after.ml        |  1 -
 test/passing/break_separators_after_docked.ml |  1 -
 .../break_separators_after_docked_wrap.ml     |  1 -
 test/passing/break_separators_after_wrap.ml   |  1 -
 test/passing/break_separators_wrap.ml         |  1 -
 ...ts => break_string_literals-never.ml.opts} |  0
 ...ref => break_string_literals-never.ml.ref} |  0
 ...=> break_string_literals-newlines.ml.opts} |  0
 ... => break_string_literals-newlines.ml.ref} |  0
 ...string_literals-newlines_and_wrap.ml.opts} |  0
 ..._string_literals-newlines_and_wrap.ml.ref} |  0
 ...erals_wrap.ml => break_string_literals.ml} |  0
 ....ml.opts => break_string_literals.ml.opts} |  0
 ...ap.ml.ref => break_string_literals.ml.ref} |  0
 test/passing/break_string_literals_never.ml   |  1 -
 .../passing/break_string_literals_newlines.ml |  1 -
 ...break_string_literals_newlines_and_wrap.ml |  1 -
 ...ter.ml.opts => doc_comments-after.ml.opts} |  0
 ...after.ml.ref => doc_comments-after.ml.ref} | 18 ++++
 ...re.ml.opts => doc_comments-before.ml.opts} |  0
 ...fore.ml.ref => doc_comments-before.ml.ref} | 18 ++++
 test/passing/doc_comments.after.ml            |  1 -
 test/passing/doc_comments.before.ml           |  1 -
 test/passing/dune                             | 88 +++++++++++++------
 ...ns.ml.opts => exp_grouping-parens.ml.opts} |  0
 ...rens.ml.ref => exp_grouping-parens.ml.ref} |  0
 ...p_grouping_preserve.ml => exp_grouping.ml} |  0
 ..._preserve.ml.opts => exp_grouping.ml.opts} |  0
 ...ng_preserve.ml.ref => exp_grouping.ml.ref} |  0
 test/passing/exp_grouping_parens.ml           |  1 -
 ...dent.ml.opts => extensions-indent.ml.opts} |  0
 ...indent.ml.ref => extensions-indent.ml.ref} |  0
 ...nt.mli.opts => extensions-indent.mli.opts} |  0
 ...dent.mli.ref => extensions-indent.mli.ref} |  0
 ...l.opts => extensions-sugar_always.ml.opts} |  0
 ....ml.ref => extensions-sugar_always.ml.ref} |  0
 test/passing/extensions_indent.ml             |  1 -
 test/passing/extensions_indent.mli            |  1 -
 test/passing/extensions_sugar_always.ml       |  1 -
 ...ne.ml.opts => field-op_begin_line.ml.opts} |  0
 ...line.ml.ref => field-op_begin_line.ml.ref} |  0
 test/passing/field_op_begin_line.ml           |  1 -
 ....ml.opts => function_indent-never.ml.opts} |  0
 ...er.ml.ref => function_indent-never.ml.ref} |  0
 ...on_indent_always.ml => function_indent.ml} |  0
 ...always.ml.opts => function_indent.ml.opts} |  0
 ...t_always.ml.ref => function_indent.ml.ref} |  0
 test/passing/function_indent_never.ml         |  1 -
 ...al.ml.opts => ite-fit_or_vertical.ml.opts} |  0
 ...ical.ml.ref => ite-fit_or_vertical.ml.ref} |  0
 ...ts => ite-fit_or_vertical_closing.ml.opts} |  0
 ...ref => ite-fit_or_vertical_closing.ml.ref} |  0
 ...> ite-fit_or_vertical_no_indicate.ml.opts} |  0
 ...=> ite-fit_or_vertical_no_indicate.ml.ref} |  0
 .../{ite_kr.ml.opts => ite-kr.ml.opts}        |  0
 test/passing/{ite_kr.ml.ref => ite-kr.ml.ref} |  0
 ...closing.ml.opts => ite-kr_closing.ml.opts} |  0
 ...r_closing.ml.ref => ite-kr_closing.ml.ref} |  0
 ..._kw_first.ml.opts => ite-kw_first.ml.opts} |  0
 ...te_kw_first.ml.ref => ite-kw_first.ml.ref} |  0
 ...g.ml.opts => ite-kw_first_closing.ml.opts} |  0
 ...ing.ml.ref => ite-kw_first_closing.ml.ref} |  0
 ....opts => ite-kw_first_no_indicate.ml.opts} |  0
 ...ml.ref => ite-kw_first_no_indicate.ml.ref} |  0
 ...dicate.ml.opts => ite-no_indicate.ml.opts} |  0
 ...indicate.ml.ref => ite-no_indicate.ml.ref} |  0
 test/passing/ite_fit_or_vertical.ml           |  1 -
 test/passing/ite_fit_or_vertical_closing.ml   |  1 -
 .../ite_fit_or_vertical_no_indicate.ml        |  1 -
 test/passing/ite_kr.ml                        |  1 -
 test/passing/ite_kr_closing.ml                |  1 -
 test/passing/ite_kw_first.ml                  |  1 -
 test/passing/ite_kw_first_closing.ml          |  1 -
 test/passing/ite_kw_first_no_indicate.ml      |  1 -
 test/passing/ite_no_indicate.ml               |  1 -
 ....ml.opts => let_binding-in_indent.ml.opts} |  0
 ...nt.ml.ref => let_binding-in_indent.ml.ref} |  0
 ...ent.ml.opts => let_binding-indent.ml.opts} |  0
 ...ndent.ml.ref => let_binding-indent.ml.ref} |  0
 test/passing/let_binding_in_indent.ml         |  1 -
 test/passing/let_binding_indent.ml            |  1 -
 ...arse.ml.opts => let_module-sparse.ml.opts} |  0
 ...sparse.ml.ref => let_module-sparse.ml.ref} |  0
 .../{let_module_compact.ml => let_module.ml}  |  0
 ...ule_compact.ml.opts => let_module.ml.opts} |  0
 ...odule_compact.ml.ref => let_module.ml.ref} |  0
 test/passing/let_module_sparse.ml             |  1 -
 test/passing/list-space_around.ml             |  1 -
 ...ver.ml.opts => match_indent-never.ml.opts} |  0
 ...never.ml.ref => match_indent-never.ml.ref} |  0
 ...match_indent_always.ml => match_indent.ml} |  0
 ...nt_always.ml.opts => match_indent.ml.opts} |  0
 ...dent_always.ml.ref => match_indent.ml.ref} |  0
 test/passing/match_indent_never.ml            |  1 -
 ...s => module_item_spacing-preserve.ml.opts} |  0
 ...ef => module_item_spacing-preserve.ml.ref} |  0
 ...pts => module_item_spacing-sparse.ml.opts} |  0
 ....ref => module_item_spacing-sparse.ml.ref} |  0
 ...cing_compact.ml => module_item_spacing.ml} |  0
 ...ct.ml.opts => module_item_spacing.ml.opts} |  0
 ...pact.ml.ref => module_item_spacing.ml.ref} |  0
 test/passing/module_item_spacing_preserve.ml  |  1 -
 test/passing/module_item_spacing_sparse.ml    |  1 -
 .../{open_auto.ml.opts => open-auto.ml.opts}  |  0
 .../{open_auto.ml.ref => open-auto.ml.ref}    |  0
 .../{open_long.ml.opts => open-long.ml.opts}  |  0
 .../{open_long.ml.ref => open-long.ml.ref}    |  0
 ...preserve.ml.opts => open-preserve.ml.opts} |  0
 ...n_preserve.ml.ref => open-preserve.ml.ref} |  0
 ...{open_short.ml.opts => open-short.ml.opts} |  0
 .../{open_short.ml.ref => open-short.ml.ref}  |  0
 test/passing/open_auto.ml                     |  1 -
 test/passing/open_long.ml                     |  1 -
 test/passing/open_preserve.ml                 |  1 -
 test/passing/open_short.ml                    |  1 -
 ...ord_loose.ml.opts => record-loose.ml.opts} |  0
 ...ecord_loose.ml.ref => record-loose.ml.ref} |  0
 ...decl.ml.opts => record-tight_decl.ml.opts} |  0
 ...t_decl.ml.ref => record-tight_decl.ml.ref} |  0
 test/passing/record_loose.ml                  |  1 -
 test/passing/record_tight_decl.ml             |  1 -
 ...erve.ml.opts => sequence-preserve.ml.opts} |  0
 ...eserve.ml.ref => sequence-preserve.ml.ref} |  0
 test/passing/sequence_preserve.ml             |  1 -
 .../types-compact-space_around-docked.ml      |  1 -
 test/passing/types-compact-space_around.ml    |  1 -
 test/passing/types-compact.ml                 |  1 -
 ...es_indent.ml.opts => types-indent.ml.opts} |  0
 ...ypes_indent.ml.ref => types-indent.ml.ref} |  0
 test/passing/types-sparse-space_around.ml     |  1 -
 test/passing/types-sparse.ml                  |  1 -
 test/passing/types_indent.ml                  |  1 -
 186 files changed, 99 insertions(+), 85 deletions(-)
 rename test/passing/{align_cases_break_all.ml.opts => align_cases-break_all.ml.opts} (100%)
 rename test/passing/{align_cases_break_all.ml.ref => align_cases-break_all.ml.ref} (100%)
 delete mode 120000 test/passing/align_cases_break_all.ml
 rename test/passing/{assign_colon_op_begin_line.ml.opts => assign_colon-op_begin_line.ml.opts} (100%)
 rename test/passing/{assign_colon_op_begin_line.ml.ref => assign_colon-op_begin_line.ml.ref} (100%)
 delete mode 120000 test/passing/assign_colon_op_begin_line.ml
 rename test/passing/{break_before_in_auto.ml.opts => break_before_in-auto.ml.opts} (100%)
 rename test/passing/{break_before_in_auto.ml.ref => break_before_in-auto.ml.ref} (100%)
 rename test/passing/{break_before_in_fit_or_vertical.ml => break_before_in.ml} (100%)
 rename test/passing/{break_before_in_fit_or_vertical.ml.opts => break_before_in.ml.opts} (100%)
 delete mode 120000 test/passing/break_before_in_auto.ml
 rename test/passing/{break_cases_align.ml.opts => break_cases-align.ml.opts} (100%)
 rename test/passing/{break_cases_align.ml.ref => break_cases-align.ml.ref} (100%)
 rename test/passing/{break_cases_all.ml.opts => break_cases-all.ml.opts} (100%)
 rename test/passing/{break_cases_all.ml.ref => break_cases-all.ml.ref} (100%)
 rename test/passing/{break_cases_closing_on_separate_line.ml.opts => break_cases-closing_on_separate_line.ml.opts} (100%)
 rename test/passing/{break_cases_closing_on_separate_line.ml.ref => break_cases-closing_on_separate_line.ml.ref} (100%)
 rename test/passing/{break_cases_closing_on_separate_line_leading_nested_match_parens.ml.opts => break_cases-closing_on_separate_line_leading_nested_match_parens.ml.opts} (100%)
 rename test/passing/{break_cases_closing_on_separate_line_leading_nested_match_parens.ml.ref => break_cases-closing_on_separate_line_leading_nested_match_parens.ml.ref} (100%)
 rename test/passing/{break_cases_cosl_lnmp_cmei.ml.opts => break_cases-cosl_lnmp_cmei.ml.opts} (100%)
 rename test/passing/{break_cases_cosl_lnmp_cmei.ml.ref => break_cases-cosl_lnmp_cmei.ml.ref} (100%)
 rename test/passing/{break_cases_fit_or_vertical.ml.opts => break_cases-fit_or_vertical.ml.opts} (100%)
 rename test/passing/{break_cases_fit_or_vertical.ml.ref => break_cases-fit_or_vertical.ml.ref} (100%)
 rename test/passing/{break_cases_nested.ml.opts => break_cases-nested.ml.opts} (100%)
 rename test/passing/{break_cases_nested.ml.ref => break_cases-nested.ml.ref} (100%)
 rename test/passing/{break_cases_normal_indent.ml.opts => break_cases-normal_indent.ml.opts} (100%)
 rename test/passing/{break_cases_normal_indent.ml.ref => break_cases-normal_indent.ml.ref} (100%)
 rename test/passing/{break_cases_toplevel.ml.opts => break_cases-toplevel.ml.opts} (100%)
 rename test/passing/{break_cases_toplevel.ml.ref => break_cases-toplevel.ml.ref} (100%)
 rename test/passing/{break_cases_fit.ml => break_cases.ml} (100%)
 rename test/passing/{break_cases_fit.ml.opts => break_cases.ml.opts} (100%)
 rename test/passing/{break_cases_fit.ml.ref => break_cases.ml.ref} (100%)
 delete mode 120000 test/passing/break_cases_align.ml
 delete mode 120000 test/passing/break_cases_all.ml
 delete mode 120000 test/passing/break_cases_closing_on_separate_line.ml
 delete mode 120000 test/passing/break_cases_closing_on_separate_line_leading_nested_match_parens.ml
 delete mode 120000 test/passing/break_cases_cosl_lnmp_cmei.ml
 delete mode 120000 test/passing/break_cases_fit_or_vertical.ml
 delete mode 120000 test/passing/break_cases_nested.ml
 delete mode 120000 test/passing/break_cases_normal_indent.ml
 delete mode 120000 test/passing/break_cases_toplevel.ml
 delete mode 120000 test/passing/break_fun_decl-fit_or_vertical.ml
 delete mode 120000 test/passing/break_fun_decl-smart.ml
 delete mode 120000 test/passing/break_fun_decl-wrap.ml
 rename test/passing/{break_separators_after.ml.opts => break_separators-after.ml.opts} (100%)
 rename test/passing/{break_separators_after.ml.ref => break_separators-after.ml.ref} (100%)
 rename test/passing/{break_separators_after_docked.ml.opts => break_separators-after_docked.ml.opts} (100%)
 rename test/passing/{break_separators_after_docked.ml.ref => break_separators-after_docked.ml.ref} (100%)
 rename test/passing/{break_separators_after_docked_wrap.ml.opts => break_separators-after_docked_wrap.ml.opts} (100%)
 rename test/passing/{break_separators_after_docked_wrap.ml.ref => break_separators-after_docked_wrap.ml.ref} (100%)
 rename test/passing/{break_separators_after_wrap.ml.opts => break_separators-after_wrap.ml.opts} (100%)
 rename test/passing/{break_separators_after_wrap.ml.ref => break_separators-after_wrap.ml.ref} (100%)
 rename test/passing/{break_separators_wrap.ml.opts => break_separators-wrap.ml.opts} (100%)
 rename test/passing/{break_separators_wrap.ml.ref => break_separators-wrap.ml.ref} (100%)
 delete mode 120000 test/passing/break_separators_after.ml
 delete mode 120000 test/passing/break_separators_after_docked.ml
 delete mode 120000 test/passing/break_separators_after_docked_wrap.ml
 delete mode 120000 test/passing/break_separators_after_wrap.ml
 delete mode 120000 test/passing/break_separators_wrap.ml
 rename test/passing/{break_string_literals_never.ml.opts => break_string_literals-never.ml.opts} (100%)
 rename test/passing/{break_string_literals_never.ml.ref => break_string_literals-never.ml.ref} (100%)
 rename test/passing/{break_string_literals_newlines.ml.opts => break_string_literals-newlines.ml.opts} (100%)
 rename test/passing/{break_string_literals_newlines.ml.ref => break_string_literals-newlines.ml.ref} (100%)
 rename test/passing/{break_string_literals_newlines_and_wrap.ml.opts => break_string_literals-newlines_and_wrap.ml.opts} (100%)
 rename test/passing/{break_string_literals_newlines_and_wrap.ml.ref => break_string_literals-newlines_and_wrap.ml.ref} (100%)
 rename test/passing/{break_string_literals_wrap.ml => break_string_literals.ml} (100%)
 rename test/passing/{break_string_literals_wrap.ml.opts => break_string_literals.ml.opts} (100%)
 rename test/passing/{break_string_literals_wrap.ml.ref => break_string_literals.ml.ref} (100%)
 delete mode 120000 test/passing/break_string_literals_never.ml
 delete mode 120000 test/passing/break_string_literals_newlines.ml
 delete mode 120000 test/passing/break_string_literals_newlines_and_wrap.ml
 rename test/passing/{doc_comments.after.ml.opts => doc_comments-after.ml.opts} (100%)
 rename test/passing/{doc_comments.after.ml.ref => doc_comments-after.ml.ref} (95%)
 rename test/passing/{doc_comments.before.ml.opts => doc_comments-before.ml.opts} (100%)
 rename test/passing/{doc_comments.before.ml.ref => doc_comments-before.ml.ref} (95%)
 delete mode 120000 test/passing/doc_comments.after.ml
 delete mode 120000 test/passing/doc_comments.before.ml
 rename test/passing/{exp_grouping_parens.ml.opts => exp_grouping-parens.ml.opts} (100%)
 rename test/passing/{exp_grouping_parens.ml.ref => exp_grouping-parens.ml.ref} (100%)
 rename test/passing/{exp_grouping_preserve.ml => exp_grouping.ml} (100%)
 rename test/passing/{exp_grouping_preserve.ml.opts => exp_grouping.ml.opts} (100%)
 rename test/passing/{exp_grouping_preserve.ml.ref => exp_grouping.ml.ref} (100%)
 delete mode 120000 test/passing/exp_grouping_parens.ml
 rename test/passing/{extensions_indent.ml.opts => extensions-indent.ml.opts} (100%)
 rename test/passing/{extensions_indent.ml.ref => extensions-indent.ml.ref} (100%)
 rename test/passing/{extensions_indent.mli.opts => extensions-indent.mli.opts} (100%)
 rename test/passing/{extensions_indent.mli.ref => extensions-indent.mli.ref} (100%)
 rename test/passing/{extensions_sugar_always.ml.opts => extensions-sugar_always.ml.opts} (100%)
 rename test/passing/{extensions_sugar_always.ml.ref => extensions-sugar_always.ml.ref} (100%)
 delete mode 120000 test/passing/extensions_indent.ml
 delete mode 120000 test/passing/extensions_indent.mli
 delete mode 120000 test/passing/extensions_sugar_always.ml
 rename test/passing/{field_op_begin_line.ml.opts => field-op_begin_line.ml.opts} (100%)
 rename test/passing/{field_op_begin_line.ml.ref => field-op_begin_line.ml.ref} (100%)
 delete mode 120000 test/passing/field_op_begin_line.ml
 rename test/passing/{function_indent_never.ml.opts => function_indent-never.ml.opts} (100%)
 rename test/passing/{function_indent_never.ml.ref => function_indent-never.ml.ref} (100%)
 rename test/passing/{function_indent_always.ml => function_indent.ml} (100%)
 rename test/passing/{function_indent_always.ml.opts => function_indent.ml.opts} (100%)
 rename test/passing/{function_indent_always.ml.ref => function_indent.ml.ref} (100%)
 delete mode 120000 test/passing/function_indent_never.ml
 rename test/passing/{ite_fit_or_vertical.ml.opts => ite-fit_or_vertical.ml.opts} (100%)
 rename test/passing/{ite_fit_or_vertical.ml.ref => ite-fit_or_vertical.ml.ref} (100%)
 rename test/passing/{ite_fit_or_vertical_closing.ml.opts => ite-fit_or_vertical_closing.ml.opts} (100%)
 rename test/passing/{ite_fit_or_vertical_closing.ml.ref => ite-fit_or_vertical_closing.ml.ref} (100%)
 rename test/passing/{ite_fit_or_vertical_no_indicate.ml.opts => ite-fit_or_vertical_no_indicate.ml.opts} (100%)
 rename test/passing/{ite_fit_or_vertical_no_indicate.ml.ref => ite-fit_or_vertical_no_indicate.ml.ref} (100%)
 rename test/passing/{ite_kr.ml.opts => ite-kr.ml.opts} (100%)
 rename test/passing/{ite_kr.ml.ref => ite-kr.ml.ref} (100%)
 rename test/passing/{ite_kr_closing.ml.opts => ite-kr_closing.ml.opts} (100%)
 rename test/passing/{ite_kr_closing.ml.ref => ite-kr_closing.ml.ref} (100%)
 rename test/passing/{ite_kw_first.ml.opts => ite-kw_first.ml.opts} (100%)
 rename test/passing/{ite_kw_first.ml.ref => ite-kw_first.ml.ref} (100%)
 rename test/passing/{ite_kw_first_closing.ml.opts => ite-kw_first_closing.ml.opts} (100%)
 rename test/passing/{ite_kw_first_closing.ml.ref => ite-kw_first_closing.ml.ref} (100%)
 rename test/passing/{ite_kw_first_no_indicate.ml.opts => ite-kw_first_no_indicate.ml.opts} (100%)
 rename test/passing/{ite_kw_first_no_indicate.ml.ref => ite-kw_first_no_indicate.ml.ref} (100%)
 rename test/passing/{ite_no_indicate.ml.opts => ite-no_indicate.ml.opts} (100%)
 rename test/passing/{ite_no_indicate.ml.ref => ite-no_indicate.ml.ref} (100%)
 delete mode 120000 test/passing/ite_fit_or_vertical.ml
 delete mode 120000 test/passing/ite_fit_or_vertical_closing.ml
 delete mode 120000 test/passing/ite_fit_or_vertical_no_indicate.ml
 delete mode 120000 test/passing/ite_kr.ml
 delete mode 120000 test/passing/ite_kr_closing.ml
 delete mode 120000 test/passing/ite_kw_first.ml
 delete mode 120000 test/passing/ite_kw_first_closing.ml
 delete mode 120000 test/passing/ite_kw_first_no_indicate.ml
 delete mode 120000 test/passing/ite_no_indicate.ml
 rename test/passing/{let_binding_in_indent.ml.opts => let_binding-in_indent.ml.opts} (100%)
 rename test/passing/{let_binding_in_indent.ml.ref => let_binding-in_indent.ml.ref} (100%)
 rename test/passing/{let_binding_indent.ml.opts => let_binding-indent.ml.opts} (100%)
 rename test/passing/{let_binding_indent.ml.ref => let_binding-indent.ml.ref} (100%)
 delete mode 120000 test/passing/let_binding_in_indent.ml
 delete mode 120000 test/passing/let_binding_indent.ml
 rename test/passing/{let_module_sparse.ml.opts => let_module-sparse.ml.opts} (100%)
 rename test/passing/{let_module_sparse.ml.ref => let_module-sparse.ml.ref} (100%)
 rename test/passing/{let_module_compact.ml => let_module.ml} (100%)
 rename test/passing/{let_module_compact.ml.opts => let_module.ml.opts} (100%)
 rename test/passing/{let_module_compact.ml.ref => let_module.ml.ref} (100%)
 delete mode 120000 test/passing/let_module_sparse.ml
 delete mode 120000 test/passing/list-space_around.ml
 rename test/passing/{match_indent_never.ml.opts => match_indent-never.ml.opts} (100%)
 rename test/passing/{match_indent_never.ml.ref => match_indent-never.ml.ref} (100%)
 rename test/passing/{match_indent_always.ml => match_indent.ml} (100%)
 rename test/passing/{match_indent_always.ml.opts => match_indent.ml.opts} (100%)
 rename test/passing/{match_indent_always.ml.ref => match_indent.ml.ref} (100%)
 delete mode 120000 test/passing/match_indent_never.ml
 rename test/passing/{module_item_spacing_preserve.ml.opts => module_item_spacing-preserve.ml.opts} (100%)
 rename test/passing/{module_item_spacing_preserve.ml.ref => module_item_spacing-preserve.ml.ref} (100%)
 rename test/passing/{module_item_spacing_sparse.ml.opts => module_item_spacing-sparse.ml.opts} (100%)
 rename test/passing/{module_item_spacing_sparse.ml.ref => module_item_spacing-sparse.ml.ref} (100%)
 rename test/passing/{module_item_spacing_compact.ml => module_item_spacing.ml} (100%)
 rename test/passing/{module_item_spacing_compact.ml.opts => module_item_spacing.ml.opts} (100%)
 rename test/passing/{module_item_spacing_compact.ml.ref => module_item_spacing.ml.ref} (100%)
 delete mode 120000 test/passing/module_item_spacing_preserve.ml
 delete mode 120000 test/passing/module_item_spacing_sparse.ml
 rename test/passing/{open_auto.ml.opts => open-auto.ml.opts} (100%)
 rename test/passing/{open_auto.ml.ref => open-auto.ml.ref} (100%)
 rename test/passing/{open_long.ml.opts => open-long.ml.opts} (100%)
 rename test/passing/{open_long.ml.ref => open-long.ml.ref} (100%)
 rename test/passing/{open_preserve.ml.opts => open-preserve.ml.opts} (100%)
 rename test/passing/{open_preserve.ml.ref => open-preserve.ml.ref} (100%)
 rename test/passing/{open_short.ml.opts => open-short.ml.opts} (100%)
 rename test/passing/{open_short.ml.ref => open-short.ml.ref} (100%)
 delete mode 120000 test/passing/open_auto.ml
 delete mode 120000 test/passing/open_long.ml
 delete mode 120000 test/passing/open_preserve.ml
 delete mode 120000 test/passing/open_short.ml
 rename test/passing/{record_loose.ml.opts => record-loose.ml.opts} (100%)
 rename test/passing/{record_loose.ml.ref => record-loose.ml.ref} (100%)
 rename test/passing/{record_tight_decl.ml.opts => record-tight_decl.ml.opts} (100%)
 rename test/passing/{record_tight_decl.ml.ref => record-tight_decl.ml.ref} (100%)
 delete mode 120000 test/passing/record_loose.ml
 delete mode 120000 test/passing/record_tight_decl.ml
 rename test/passing/{sequence_preserve.ml.opts => sequence-preserve.ml.opts} (100%)
 rename test/passing/{sequence_preserve.ml.ref => sequence-preserve.ml.ref} (100%)
 delete mode 120000 test/passing/sequence_preserve.ml
 delete mode 120000 test/passing/types-compact-space_around-docked.ml
 delete mode 120000 test/passing/types-compact-space_around.ml
 delete mode 120000 test/passing/types-compact.ml
 rename test/passing/{types_indent.ml.opts => types-indent.ml.opts} (100%)
 rename test/passing/{types_indent.ml.ref => types-indent.ml.ref} (100%)
 delete mode 120000 test/passing/types-sparse-space_around.ml
 delete mode 120000 test/passing/types-sparse.ml
 delete mode 120000 test/passing/types_indent.ml

diff --git a/test/passing/align_cases_break_all.ml.opts b/test/passing/align_cases-break_all.ml.opts
similarity index 100%
rename from test/passing/align_cases_break_all.ml.opts
rename to test/passing/align_cases-break_all.ml.opts
diff --git a/test/passing/align_cases_break_all.ml.ref b/test/passing/align_cases-break_all.ml.ref
similarity index 100%
rename from test/passing/align_cases_break_all.ml.ref
rename to test/passing/align_cases-break_all.ml.ref
diff --git a/test/passing/align_cases_break_all.ml b/test/passing/align_cases_break_all.ml
deleted file mode 120000
index 7815e7a83c..0000000000
--- a/test/passing/align_cases_break_all.ml
+++ /dev/null
@@ -1 +0,0 @@
-align_cases.ml
\ No newline at end of file
diff --git a/test/passing/assign_colon_op_begin_line.ml.opts b/test/passing/assign_colon-op_begin_line.ml.opts
similarity index 100%
rename from test/passing/assign_colon_op_begin_line.ml.opts
rename to test/passing/assign_colon-op_begin_line.ml.opts
diff --git a/test/passing/assign_colon_op_begin_line.ml.ref b/test/passing/assign_colon-op_begin_line.ml.ref
similarity index 100%
rename from test/passing/assign_colon_op_begin_line.ml.ref
rename to test/passing/assign_colon-op_begin_line.ml.ref
diff --git a/test/passing/assign_colon_op_begin_line.ml b/test/passing/assign_colon_op_begin_line.ml
deleted file mode 120000
index 8ee4dc8b5e..0000000000
--- a/test/passing/assign_colon_op_begin_line.ml
+++ /dev/null
@@ -1 +0,0 @@
-assign_colon.ml
\ No newline at end of file
diff --git a/test/passing/break_before_in_auto.ml.opts b/test/passing/break_before_in-auto.ml.opts
similarity index 100%
rename from test/passing/break_before_in_auto.ml.opts
rename to test/passing/break_before_in-auto.ml.opts
diff --git a/test/passing/break_before_in_auto.ml.ref b/test/passing/break_before_in-auto.ml.ref
similarity index 100%
rename from test/passing/break_before_in_auto.ml.ref
rename to test/passing/break_before_in-auto.ml.ref
diff --git a/test/passing/break_before_in_fit_or_vertical.ml b/test/passing/break_before_in.ml
similarity index 100%
rename from test/passing/break_before_in_fit_or_vertical.ml
rename to test/passing/break_before_in.ml
diff --git a/test/passing/break_before_in_fit_or_vertical.ml.opts b/test/passing/break_before_in.ml.opts
similarity index 100%
rename from test/passing/break_before_in_fit_or_vertical.ml.opts
rename to test/passing/break_before_in.ml.opts
diff --git a/test/passing/break_before_in_auto.ml b/test/passing/break_before_in_auto.ml
deleted file mode 120000
index 30063ceaa7..0000000000
--- a/test/passing/break_before_in_auto.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_before_in_fit_or_vertical.ml
\ No newline at end of file
diff --git a/test/passing/break_cases_align.ml.opts b/test/passing/break_cases-align.ml.opts
similarity index 100%
rename from test/passing/break_cases_align.ml.opts
rename to test/passing/break_cases-align.ml.opts
diff --git a/test/passing/break_cases_align.ml.ref b/test/passing/break_cases-align.ml.ref
similarity index 100%
rename from test/passing/break_cases_align.ml.ref
rename to test/passing/break_cases-align.ml.ref
diff --git a/test/passing/break_cases_all.ml.opts b/test/passing/break_cases-all.ml.opts
similarity index 100%
rename from test/passing/break_cases_all.ml.opts
rename to test/passing/break_cases-all.ml.opts
diff --git a/test/passing/break_cases_all.ml.ref b/test/passing/break_cases-all.ml.ref
similarity index 100%
rename from test/passing/break_cases_all.ml.ref
rename to test/passing/break_cases-all.ml.ref
diff --git a/test/passing/break_cases_closing_on_separate_line.ml.opts b/test/passing/break_cases-closing_on_separate_line.ml.opts
similarity index 100%
rename from test/passing/break_cases_closing_on_separate_line.ml.opts
rename to test/passing/break_cases-closing_on_separate_line.ml.opts
diff --git a/test/passing/break_cases_closing_on_separate_line.ml.ref b/test/passing/break_cases-closing_on_separate_line.ml.ref
similarity index 100%
rename from test/passing/break_cases_closing_on_separate_line.ml.ref
rename to test/passing/break_cases-closing_on_separate_line.ml.ref
diff --git a/test/passing/break_cases_closing_on_separate_line_leading_nested_match_parens.ml.opts b/test/passing/break_cases-closing_on_separate_line_leading_nested_match_parens.ml.opts
similarity index 100%
rename from test/passing/break_cases_closing_on_separate_line_leading_nested_match_parens.ml.opts
rename to test/passing/break_cases-closing_on_separate_line_leading_nested_match_parens.ml.opts
diff --git a/test/passing/break_cases_closing_on_separate_line_leading_nested_match_parens.ml.ref b/test/passing/break_cases-closing_on_separate_line_leading_nested_match_parens.ml.ref
similarity index 100%
rename from test/passing/break_cases_closing_on_separate_line_leading_nested_match_parens.ml.ref
rename to test/passing/break_cases-closing_on_separate_line_leading_nested_match_parens.ml.ref
diff --git a/test/passing/break_cases_cosl_lnmp_cmei.ml.opts b/test/passing/break_cases-cosl_lnmp_cmei.ml.opts
similarity index 100%
rename from test/passing/break_cases_cosl_lnmp_cmei.ml.opts
rename to test/passing/break_cases-cosl_lnmp_cmei.ml.opts
diff --git a/test/passing/break_cases_cosl_lnmp_cmei.ml.ref b/test/passing/break_cases-cosl_lnmp_cmei.ml.ref
similarity index 100%
rename from test/passing/break_cases_cosl_lnmp_cmei.ml.ref
rename to test/passing/break_cases-cosl_lnmp_cmei.ml.ref
diff --git a/test/passing/break_cases_fit_or_vertical.ml.opts b/test/passing/break_cases-fit_or_vertical.ml.opts
similarity index 100%
rename from test/passing/break_cases_fit_or_vertical.ml.opts
rename to test/passing/break_cases-fit_or_vertical.ml.opts
diff --git a/test/passing/break_cases_fit_or_vertical.ml.ref b/test/passing/break_cases-fit_or_vertical.ml.ref
similarity index 100%
rename from test/passing/break_cases_fit_or_vertical.ml.ref
rename to test/passing/break_cases-fit_or_vertical.ml.ref
diff --git a/test/passing/break_cases_nested.ml.opts b/test/passing/break_cases-nested.ml.opts
similarity index 100%
rename from test/passing/break_cases_nested.ml.opts
rename to test/passing/break_cases-nested.ml.opts
diff --git a/test/passing/break_cases_nested.ml.ref b/test/passing/break_cases-nested.ml.ref
similarity index 100%
rename from test/passing/break_cases_nested.ml.ref
rename to test/passing/break_cases-nested.ml.ref
diff --git a/test/passing/break_cases_normal_indent.ml.opts b/test/passing/break_cases-normal_indent.ml.opts
similarity index 100%
rename from test/passing/break_cases_normal_indent.ml.opts
rename to test/passing/break_cases-normal_indent.ml.opts
diff --git a/test/passing/break_cases_normal_indent.ml.ref b/test/passing/break_cases-normal_indent.ml.ref
similarity index 100%
rename from test/passing/break_cases_normal_indent.ml.ref
rename to test/passing/break_cases-normal_indent.ml.ref
diff --git a/test/passing/break_cases_toplevel.ml.opts b/test/passing/break_cases-toplevel.ml.opts
similarity index 100%
rename from test/passing/break_cases_toplevel.ml.opts
rename to test/passing/break_cases-toplevel.ml.opts
diff --git a/test/passing/break_cases_toplevel.ml.ref b/test/passing/break_cases-toplevel.ml.ref
similarity index 100%
rename from test/passing/break_cases_toplevel.ml.ref
rename to test/passing/break_cases-toplevel.ml.ref
diff --git a/test/passing/break_cases_fit.ml b/test/passing/break_cases.ml
similarity index 100%
rename from test/passing/break_cases_fit.ml
rename to test/passing/break_cases.ml
diff --git a/test/passing/break_cases_fit.ml.opts b/test/passing/break_cases.ml.opts
similarity index 100%
rename from test/passing/break_cases_fit.ml.opts
rename to test/passing/break_cases.ml.opts
diff --git a/test/passing/break_cases_fit.ml.ref b/test/passing/break_cases.ml.ref
similarity index 100%
rename from test/passing/break_cases_fit.ml.ref
rename to test/passing/break_cases.ml.ref
diff --git a/test/passing/break_cases_align.ml b/test/passing/break_cases_align.ml
deleted file mode 120000
index f1141e9aea..0000000000
--- a/test/passing/break_cases_align.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_cases_fit.ml
\ No newline at end of file
diff --git a/test/passing/break_cases_all.ml b/test/passing/break_cases_all.ml
deleted file mode 120000
index f1141e9aea..0000000000
--- a/test/passing/break_cases_all.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_cases_fit.ml
\ No newline at end of file
diff --git a/test/passing/break_cases_closing_on_separate_line.ml b/test/passing/break_cases_closing_on_separate_line.ml
deleted file mode 120000
index f1141e9aea..0000000000
--- a/test/passing/break_cases_closing_on_separate_line.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_cases_fit.ml
\ No newline at end of file
diff --git a/test/passing/break_cases_closing_on_separate_line_leading_nested_match_parens.ml b/test/passing/break_cases_closing_on_separate_line_leading_nested_match_parens.ml
deleted file mode 120000
index f1141e9aea..0000000000
--- a/test/passing/break_cases_closing_on_separate_line_leading_nested_match_parens.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_cases_fit.ml
\ No newline at end of file
diff --git a/test/passing/break_cases_cosl_lnmp_cmei.ml b/test/passing/break_cases_cosl_lnmp_cmei.ml
deleted file mode 120000
index f1141e9aea..0000000000
--- a/test/passing/break_cases_cosl_lnmp_cmei.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_cases_fit.ml
\ No newline at end of file
diff --git a/test/passing/break_cases_fit_or_vertical.ml b/test/passing/break_cases_fit_or_vertical.ml
deleted file mode 120000
index f1141e9aea..0000000000
--- a/test/passing/break_cases_fit_or_vertical.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_cases_fit.ml
\ No newline at end of file
diff --git a/test/passing/break_cases_nested.ml b/test/passing/break_cases_nested.ml
deleted file mode 120000
index f1141e9aea..0000000000
--- a/test/passing/break_cases_nested.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_cases_fit.ml
\ No newline at end of file
diff --git a/test/passing/break_cases_normal_indent.ml b/test/passing/break_cases_normal_indent.ml
deleted file mode 120000
index f1141e9aea..0000000000
--- a/test/passing/break_cases_normal_indent.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_cases_fit.ml
\ No newline at end of file
diff --git a/test/passing/break_cases_toplevel.ml b/test/passing/break_cases_toplevel.ml
deleted file mode 120000
index f1141e9aea..0000000000
--- a/test/passing/break_cases_toplevel.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_cases_fit.ml
\ No newline at end of file
diff --git a/test/passing/break_fun_decl-fit_or_vertical.ml b/test/passing/break_fun_decl-fit_or_vertical.ml
deleted file mode 120000
index eafb8e7ee1..0000000000
--- a/test/passing/break_fun_decl-fit_or_vertical.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_fun_decl.ml
\ No newline at end of file
diff --git a/test/passing/break_fun_decl-smart.ml b/test/passing/break_fun_decl-smart.ml
deleted file mode 120000
index eafb8e7ee1..0000000000
--- a/test/passing/break_fun_decl-smart.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_fun_decl.ml
\ No newline at end of file
diff --git a/test/passing/break_fun_decl-wrap.ml b/test/passing/break_fun_decl-wrap.ml
deleted file mode 120000
index eafb8e7ee1..0000000000
--- a/test/passing/break_fun_decl-wrap.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_fun_decl.ml
\ No newline at end of file
diff --git a/test/passing/break_separators_after.ml.opts b/test/passing/break_separators-after.ml.opts
similarity index 100%
rename from test/passing/break_separators_after.ml.opts
rename to test/passing/break_separators-after.ml.opts
diff --git a/test/passing/break_separators_after.ml.ref b/test/passing/break_separators-after.ml.ref
similarity index 100%
rename from test/passing/break_separators_after.ml.ref
rename to test/passing/break_separators-after.ml.ref
diff --git a/test/passing/break_separators_after_docked.ml.opts b/test/passing/break_separators-after_docked.ml.opts
similarity index 100%
rename from test/passing/break_separators_after_docked.ml.opts
rename to test/passing/break_separators-after_docked.ml.opts
diff --git a/test/passing/break_separators_after_docked.ml.ref b/test/passing/break_separators-after_docked.ml.ref
similarity index 100%
rename from test/passing/break_separators_after_docked.ml.ref
rename to test/passing/break_separators-after_docked.ml.ref
diff --git a/test/passing/break_separators_after_docked_wrap.ml.opts b/test/passing/break_separators-after_docked_wrap.ml.opts
similarity index 100%
rename from test/passing/break_separators_after_docked_wrap.ml.opts
rename to test/passing/break_separators-after_docked_wrap.ml.opts
diff --git a/test/passing/break_separators_after_docked_wrap.ml.ref b/test/passing/break_separators-after_docked_wrap.ml.ref
similarity index 100%
rename from test/passing/break_separators_after_docked_wrap.ml.ref
rename to test/passing/break_separators-after_docked_wrap.ml.ref
diff --git a/test/passing/break_separators_after_wrap.ml.opts b/test/passing/break_separators-after_wrap.ml.opts
similarity index 100%
rename from test/passing/break_separators_after_wrap.ml.opts
rename to test/passing/break_separators-after_wrap.ml.opts
diff --git a/test/passing/break_separators_after_wrap.ml.ref b/test/passing/break_separators-after_wrap.ml.ref
similarity index 100%
rename from test/passing/break_separators_after_wrap.ml.ref
rename to test/passing/break_separators-after_wrap.ml.ref
diff --git a/test/passing/break_separators_wrap.ml.opts b/test/passing/break_separators-wrap.ml.opts
similarity index 100%
rename from test/passing/break_separators_wrap.ml.opts
rename to test/passing/break_separators-wrap.ml.opts
diff --git a/test/passing/break_separators_wrap.ml.ref b/test/passing/break_separators-wrap.ml.ref
similarity index 100%
rename from test/passing/break_separators_wrap.ml.ref
rename to test/passing/break_separators-wrap.ml.ref
diff --git a/test/passing/break_separators_after.ml b/test/passing/break_separators_after.ml
deleted file mode 120000
index 17baf96a49..0000000000
--- a/test/passing/break_separators_after.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_separators.ml
\ No newline at end of file
diff --git a/test/passing/break_separators_after_docked.ml b/test/passing/break_separators_after_docked.ml
deleted file mode 120000
index 17baf96a49..0000000000
--- a/test/passing/break_separators_after_docked.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_separators.ml
\ No newline at end of file
diff --git a/test/passing/break_separators_after_docked_wrap.ml b/test/passing/break_separators_after_docked_wrap.ml
deleted file mode 120000
index 17baf96a49..0000000000
--- a/test/passing/break_separators_after_docked_wrap.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_separators.ml
\ No newline at end of file
diff --git a/test/passing/break_separators_after_wrap.ml b/test/passing/break_separators_after_wrap.ml
deleted file mode 120000
index 17baf96a49..0000000000
--- a/test/passing/break_separators_after_wrap.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_separators.ml
\ No newline at end of file
diff --git a/test/passing/break_separators_wrap.ml b/test/passing/break_separators_wrap.ml
deleted file mode 120000
index 17baf96a49..0000000000
--- a/test/passing/break_separators_wrap.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_separators.ml
\ No newline at end of file
diff --git a/test/passing/break_string_literals_never.ml.opts b/test/passing/break_string_literals-never.ml.opts
similarity index 100%
rename from test/passing/break_string_literals_never.ml.opts
rename to test/passing/break_string_literals-never.ml.opts
diff --git a/test/passing/break_string_literals_never.ml.ref b/test/passing/break_string_literals-never.ml.ref
similarity index 100%
rename from test/passing/break_string_literals_never.ml.ref
rename to test/passing/break_string_literals-never.ml.ref
diff --git a/test/passing/break_string_literals_newlines.ml.opts b/test/passing/break_string_literals-newlines.ml.opts
similarity index 100%
rename from test/passing/break_string_literals_newlines.ml.opts
rename to test/passing/break_string_literals-newlines.ml.opts
diff --git a/test/passing/break_string_literals_newlines.ml.ref b/test/passing/break_string_literals-newlines.ml.ref
similarity index 100%
rename from test/passing/break_string_literals_newlines.ml.ref
rename to test/passing/break_string_literals-newlines.ml.ref
diff --git a/test/passing/break_string_literals_newlines_and_wrap.ml.opts b/test/passing/break_string_literals-newlines_and_wrap.ml.opts
similarity index 100%
rename from test/passing/break_string_literals_newlines_and_wrap.ml.opts
rename to test/passing/break_string_literals-newlines_and_wrap.ml.opts
diff --git a/test/passing/break_string_literals_newlines_and_wrap.ml.ref b/test/passing/break_string_literals-newlines_and_wrap.ml.ref
similarity index 100%
rename from test/passing/break_string_literals_newlines_and_wrap.ml.ref
rename to test/passing/break_string_literals-newlines_and_wrap.ml.ref
diff --git a/test/passing/break_string_literals_wrap.ml b/test/passing/break_string_literals.ml
similarity index 100%
rename from test/passing/break_string_literals_wrap.ml
rename to test/passing/break_string_literals.ml
diff --git a/test/passing/break_string_literals_wrap.ml.opts b/test/passing/break_string_literals.ml.opts
similarity index 100%
rename from test/passing/break_string_literals_wrap.ml.opts
rename to test/passing/break_string_literals.ml.opts
diff --git a/test/passing/break_string_literals_wrap.ml.ref b/test/passing/break_string_literals.ml.ref
similarity index 100%
rename from test/passing/break_string_literals_wrap.ml.ref
rename to test/passing/break_string_literals.ml.ref
diff --git a/test/passing/break_string_literals_never.ml b/test/passing/break_string_literals_never.ml
deleted file mode 120000
index 3c89820f1c..0000000000
--- a/test/passing/break_string_literals_never.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_string_literals_wrap.ml
\ No newline at end of file
diff --git a/test/passing/break_string_literals_newlines.ml b/test/passing/break_string_literals_newlines.ml
deleted file mode 120000
index 3c89820f1c..0000000000
--- a/test/passing/break_string_literals_newlines.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_string_literals_wrap.ml
\ No newline at end of file
diff --git a/test/passing/break_string_literals_newlines_and_wrap.ml b/test/passing/break_string_literals_newlines_and_wrap.ml
deleted file mode 120000
index 3c89820f1c..0000000000
--- a/test/passing/break_string_literals_newlines_and_wrap.ml
+++ /dev/null
@@ -1 +0,0 @@
-break_string_literals_wrap.ml
\ No newline at end of file
diff --git a/test/passing/doc_comments.after.ml.opts b/test/passing/doc_comments-after.ml.opts
similarity index 100%
rename from test/passing/doc_comments.after.ml.opts
rename to test/passing/doc_comments-after.ml.opts
diff --git a/test/passing/doc_comments.after.ml.ref b/test/passing/doc_comments-after.ml.ref
similarity index 95%
rename from test/passing/doc_comments.after.ml.ref
rename to test/passing/doc_comments-after.ml.ref
index 0dd9a1f574..276642d954 100644
--- a/test/passing/doc_comments.after.ml.ref
+++ b/test/passing/doc_comments-after.ml.ref
@@ -244,3 +244,21 @@ end
    processing "y = t". If we don't explicitly preserve "x = y", the
    normalizer cannot pick it up *)
 let _ = ()
+
+(** Tags without text *)
+
+(** @see <Abc> *)
+
+(** @before a *)
+
+(** @deprecated *)
+
+(** @param b *)
+
+(** @raise c *)
+
+(** @return *)
+
+(** @see 'file' *)
+
+(** @see "title" *)
diff --git a/test/passing/doc_comments.before.ml.opts b/test/passing/doc_comments-before.ml.opts
similarity index 100%
rename from test/passing/doc_comments.before.ml.opts
rename to test/passing/doc_comments-before.ml.opts
diff --git a/test/passing/doc_comments.before.ml.ref b/test/passing/doc_comments-before.ml.ref
similarity index 95%
rename from test/passing/doc_comments.before.ml.ref
rename to test/passing/doc_comments-before.ml.ref
index 074daf3b73..9264714f5f 100644
--- a/test/passing/doc_comments.before.ml.ref
+++ b/test/passing/doc_comments-before.ml.ref
@@ -244,3 +244,21 @@ end
    processing "y = t". If we don't explicitly preserve "x = y", the
    normalizer cannot pick it up *)
 let _ = ()
+
+(** Tags without text *)
+
+(** @see <Abc> *)
+
+(** @before a *)
+
+(** @deprecated *)
+
+(** @param b *)
+
+(** @raise c *)
+
+(** @return *)
+
+(** @see 'file' *)
+
+(** @see "title" *)
diff --git a/test/passing/doc_comments.after.ml b/test/passing/doc_comments.after.ml
deleted file mode 120000
index 31c5e75081..0000000000
--- a/test/passing/doc_comments.after.ml
+++ /dev/null
@@ -1 +0,0 @@
-doc_comments.ml
\ No newline at end of file
diff --git a/test/passing/doc_comments.before.ml b/test/passing/doc_comments.before.ml
deleted file mode 120000
index 31c5e75081..0000000000
--- a/test/passing/doc_comments.before.ml
+++ /dev/null
@@ -1 +0,0 @@
-doc_comments.ml
\ No newline at end of file
diff --git a/test/passing/dune b/test/passing/dune
index 995b52e1d0..23467fd01b 100644
--- a/test/passing/dune
+++ b/test/passing/dune
@@ -1,9 +1,8 @@
 (* -*- tuareg -*- *)
 
-type setup =
-  { mutable has_ref: bool
-  ; mutable has_opts: bool
-  ; mutable extra_deps: string list }
+type out = {ref: string option; opts: string option}
+
+type setup = {mutable outputs: out list; mutable extra_deps: string list}
 
 let read_lines fn =
   let rec aux acc ic =
@@ -16,19 +15,54 @@ let read_lines fn =
 let register_file tests fname =
   match String.split_on_char '.' fname with
   | test_name :: (("ml" | "mli") as ext) :: rest -> (
-      let test_name = test_name ^ "." ^ ext in
+      let src_test_name = test_name ^ "." ^ ext in
       let setup =
-        match Hashtbl.find tests test_name with
+        match Hashtbl.find tests src_test_name with
         | setup -> setup
-        | exception Not_found ->
-            let s = {has_ref= false; has_opts= false; extra_deps= []} in
-            Hashtbl.add tests test_name s ;
-            s
+        | exception Not_found -> (
+          (* foo_file-some_variant.ml should derive from foo_file.ml *)
+          match String.index_opt test_name '-' with
+          | None ->
+              let s = {outputs= []; extra_deps= []} in
+              Hashtbl.add tests src_test_name s ;
+              s
+          | Some i -> (
+              let src_test_name = String.sub test_name 0 i ^ "." ^ ext in
+              match Hashtbl.find tests src_test_name with
+              | setup -> setup
+              | exception Not_found ->
+                  let s = {outputs= []; extra_deps= []} in
+                  Hashtbl.add tests src_test_name s ;
+                  s ) )
       in
       match rest with
       | [] -> ()
-      | ["opts"] -> setup.has_opts <- true
-      | ["ref"] -> setup.has_ref <- true
+      | ["opts"] ->
+          let ref_name = test_name ^ "." ^ ext ^ ".ref" in
+          let ref_exists {ref; _} =
+            Option.equal String.equal ref (Some ref_name)
+          in
+          let outputs =
+            if List.exists ref_exists setup.outputs then
+              let opts = Some fname in
+              let update o = if ref_exists o then {o with opts} else o in
+              List.map update setup.outputs
+            else {ref= None; opts= Some fname} :: setup.outputs
+          in
+          setup.outputs <- outputs
+      | ["ref"] ->
+          let opts_name = test_name ^ "." ^ ext ^ ".opts" in
+          let opts_exists {opts; _} =
+            Option.equal String.equal opts (Some opts_name)
+          in
+          let outputs =
+            if List.exists opts_exists setup.outputs then
+              let ref = Some fname in
+              let update o = if opts_exists o then {o with ref} else o in
+              List.map update setup.outputs
+            else {ref= Some fname; opts= None} :: setup.outputs
+          in
+          setup.outputs <- outputs
       | ["deps"] -> setup.extra_deps <- read_lines fname
       | _ -> invalid_arg fname )
   | _ -> ()
@@ -37,17 +71,20 @@ let register_file tests fname =
 
 let emit_test buffer test_name setup =
   let open Printf in
-  let opts =
-    if setup.has_opts then sprintf " %%{read-lines:%s.opts}" test_name
-    else ""
-  in
-  let ref_name = if setup.has_ref then test_name ^ ".ref" else test_name in
   let extra_deps = String.concat " " setup.extra_deps in
-  Printf.ksprintf
-    (Buffer.add_string buffer)
-    {|
+  List.iteri
+    (fun i output ->
+      let opts =
+        match output.opts with
+        | Some o -> sprintf " %%{read-lines:%s}" o
+        | None -> ""
+      in
+      let ref_name = Option.value output.ref ~default:test_name in
+      Printf.ksprintf
+        (Buffer.add_string buffer)
+        {|
 (rule
- (targets %s.output)
+ (targets %s.%i.output)
  (deps (:input %s) .ocamlformat %s)
  (action
    (setenv OCAMLFORMAT "max-iters=2"
@@ -56,11 +93,12 @@ let emit_test buffer test_name setup =
 
 (alias
  (name runtest)
- (deps %s %s.output)
- (action (diff %s %s.output)))
+ (deps %s %s.%i.output)
+ (action (diff %s %s.%i.output)))
 |}
-    test_name test_name extra_deps opts ref_name test_name ref_name
-    test_name
+        test_name i test_name extra_deps opts ref_name test_name i ref_name
+        test_name i)
+    setup.outputs
 
 let tests = Hashtbl.create 64
 
diff --git a/test/passing/exp_grouping_parens.ml.opts b/test/passing/exp_grouping-parens.ml.opts
similarity index 100%
rename from test/passing/exp_grouping_parens.ml.opts
rename to test/passing/exp_grouping-parens.ml.opts
diff --git a/test/passing/exp_grouping_parens.ml.ref b/test/passing/exp_grouping-parens.ml.ref
similarity index 100%
rename from test/passing/exp_grouping_parens.ml.ref
rename to test/passing/exp_grouping-parens.ml.ref
diff --git a/test/passing/exp_grouping_preserve.ml b/test/passing/exp_grouping.ml
similarity index 100%
rename from test/passing/exp_grouping_preserve.ml
rename to test/passing/exp_grouping.ml
diff --git a/test/passing/exp_grouping_preserve.ml.opts b/test/passing/exp_grouping.ml.opts
similarity index 100%
rename from test/passing/exp_grouping_preserve.ml.opts
rename to test/passing/exp_grouping.ml.opts
diff --git a/test/passing/exp_grouping_preserve.ml.ref b/test/passing/exp_grouping.ml.ref
similarity index 100%
rename from test/passing/exp_grouping_preserve.ml.ref
rename to test/passing/exp_grouping.ml.ref
diff --git a/test/passing/exp_grouping_parens.ml b/test/passing/exp_grouping_parens.ml
deleted file mode 120000
index 8020b127a8..0000000000
--- a/test/passing/exp_grouping_parens.ml
+++ /dev/null
@@ -1 +0,0 @@
-exp_grouping_preserve.ml
\ No newline at end of file
diff --git a/test/passing/extensions_indent.ml.opts b/test/passing/extensions-indent.ml.opts
similarity index 100%
rename from test/passing/extensions_indent.ml.opts
rename to test/passing/extensions-indent.ml.opts
diff --git a/test/passing/extensions_indent.ml.ref b/test/passing/extensions-indent.ml.ref
similarity index 100%
rename from test/passing/extensions_indent.ml.ref
rename to test/passing/extensions-indent.ml.ref
diff --git a/test/passing/extensions_indent.mli.opts b/test/passing/extensions-indent.mli.opts
similarity index 100%
rename from test/passing/extensions_indent.mli.opts
rename to test/passing/extensions-indent.mli.opts
diff --git a/test/passing/extensions_indent.mli.ref b/test/passing/extensions-indent.mli.ref
similarity index 100%
rename from test/passing/extensions_indent.mli.ref
rename to test/passing/extensions-indent.mli.ref
diff --git a/test/passing/extensions_sugar_always.ml.opts b/test/passing/extensions-sugar_always.ml.opts
similarity index 100%
rename from test/passing/extensions_sugar_always.ml.opts
rename to test/passing/extensions-sugar_always.ml.opts
diff --git a/test/passing/extensions_sugar_always.ml.ref b/test/passing/extensions-sugar_always.ml.ref
similarity index 100%
rename from test/passing/extensions_sugar_always.ml.ref
rename to test/passing/extensions-sugar_always.ml.ref
diff --git a/test/passing/extensions_indent.ml b/test/passing/extensions_indent.ml
deleted file mode 120000
index 6c5c39f77e..0000000000
--- a/test/passing/extensions_indent.ml
+++ /dev/null
@@ -1 +0,0 @@
-extensions.ml
\ No newline at end of file
diff --git a/test/passing/extensions_indent.mli b/test/passing/extensions_indent.mli
deleted file mode 120000
index 51d4e8145c..0000000000
--- a/test/passing/extensions_indent.mli
+++ /dev/null
@@ -1 +0,0 @@
-extensions.mli
\ No newline at end of file
diff --git a/test/passing/extensions_sugar_always.ml b/test/passing/extensions_sugar_always.ml
deleted file mode 120000
index 6c5c39f77e..0000000000
--- a/test/passing/extensions_sugar_always.ml
+++ /dev/null
@@ -1 +0,0 @@
-extensions.ml
\ No newline at end of file
diff --git a/test/passing/field_op_begin_line.ml.opts b/test/passing/field-op_begin_line.ml.opts
similarity index 100%
rename from test/passing/field_op_begin_line.ml.opts
rename to test/passing/field-op_begin_line.ml.opts
diff --git a/test/passing/field_op_begin_line.ml.ref b/test/passing/field-op_begin_line.ml.ref
similarity index 100%
rename from test/passing/field_op_begin_line.ml.ref
rename to test/passing/field-op_begin_line.ml.ref
diff --git a/test/passing/field_op_begin_line.ml b/test/passing/field_op_begin_line.ml
deleted file mode 120000
index ff0c87bd89..0000000000
--- a/test/passing/field_op_begin_line.ml
+++ /dev/null
@@ -1 +0,0 @@
-field.ml
\ No newline at end of file
diff --git a/test/passing/function_indent_never.ml.opts b/test/passing/function_indent-never.ml.opts
similarity index 100%
rename from test/passing/function_indent_never.ml.opts
rename to test/passing/function_indent-never.ml.opts
diff --git a/test/passing/function_indent_never.ml.ref b/test/passing/function_indent-never.ml.ref
similarity index 100%
rename from test/passing/function_indent_never.ml.ref
rename to test/passing/function_indent-never.ml.ref
diff --git a/test/passing/function_indent_always.ml b/test/passing/function_indent.ml
similarity index 100%
rename from test/passing/function_indent_always.ml
rename to test/passing/function_indent.ml
diff --git a/test/passing/function_indent_always.ml.opts b/test/passing/function_indent.ml.opts
similarity index 100%
rename from test/passing/function_indent_always.ml.opts
rename to test/passing/function_indent.ml.opts
diff --git a/test/passing/function_indent_always.ml.ref b/test/passing/function_indent.ml.ref
similarity index 100%
rename from test/passing/function_indent_always.ml.ref
rename to test/passing/function_indent.ml.ref
diff --git a/test/passing/function_indent_never.ml b/test/passing/function_indent_never.ml
deleted file mode 120000
index 5e71b98361..0000000000
--- a/test/passing/function_indent_never.ml
+++ /dev/null
@@ -1 +0,0 @@
-function_indent_always.ml
\ No newline at end of file
diff --git a/test/passing/ite_fit_or_vertical.ml.opts b/test/passing/ite-fit_or_vertical.ml.opts
similarity index 100%
rename from test/passing/ite_fit_or_vertical.ml.opts
rename to test/passing/ite-fit_or_vertical.ml.opts
diff --git a/test/passing/ite_fit_or_vertical.ml.ref b/test/passing/ite-fit_or_vertical.ml.ref
similarity index 100%
rename from test/passing/ite_fit_or_vertical.ml.ref
rename to test/passing/ite-fit_or_vertical.ml.ref
diff --git a/test/passing/ite_fit_or_vertical_closing.ml.opts b/test/passing/ite-fit_or_vertical_closing.ml.opts
similarity index 100%
rename from test/passing/ite_fit_or_vertical_closing.ml.opts
rename to test/passing/ite-fit_or_vertical_closing.ml.opts
diff --git a/test/passing/ite_fit_or_vertical_closing.ml.ref b/test/passing/ite-fit_or_vertical_closing.ml.ref
similarity index 100%
rename from test/passing/ite_fit_or_vertical_closing.ml.ref
rename to test/passing/ite-fit_or_vertical_closing.ml.ref
diff --git a/test/passing/ite_fit_or_vertical_no_indicate.ml.opts b/test/passing/ite-fit_or_vertical_no_indicate.ml.opts
similarity index 100%
rename from test/passing/ite_fit_or_vertical_no_indicate.ml.opts
rename to test/passing/ite-fit_or_vertical_no_indicate.ml.opts
diff --git a/test/passing/ite_fit_or_vertical_no_indicate.ml.ref b/test/passing/ite-fit_or_vertical_no_indicate.ml.ref
similarity index 100%
rename from test/passing/ite_fit_or_vertical_no_indicate.ml.ref
rename to test/passing/ite-fit_or_vertical_no_indicate.ml.ref
diff --git a/test/passing/ite_kr.ml.opts b/test/passing/ite-kr.ml.opts
similarity index 100%
rename from test/passing/ite_kr.ml.opts
rename to test/passing/ite-kr.ml.opts
diff --git a/test/passing/ite_kr.ml.ref b/test/passing/ite-kr.ml.ref
similarity index 100%
rename from test/passing/ite_kr.ml.ref
rename to test/passing/ite-kr.ml.ref
diff --git a/test/passing/ite_kr_closing.ml.opts b/test/passing/ite-kr_closing.ml.opts
similarity index 100%
rename from test/passing/ite_kr_closing.ml.opts
rename to test/passing/ite-kr_closing.ml.opts
diff --git a/test/passing/ite_kr_closing.ml.ref b/test/passing/ite-kr_closing.ml.ref
similarity index 100%
rename from test/passing/ite_kr_closing.ml.ref
rename to test/passing/ite-kr_closing.ml.ref
diff --git a/test/passing/ite_kw_first.ml.opts b/test/passing/ite-kw_first.ml.opts
similarity index 100%
rename from test/passing/ite_kw_first.ml.opts
rename to test/passing/ite-kw_first.ml.opts
diff --git a/test/passing/ite_kw_first.ml.ref b/test/passing/ite-kw_first.ml.ref
similarity index 100%
rename from test/passing/ite_kw_first.ml.ref
rename to test/passing/ite-kw_first.ml.ref
diff --git a/test/passing/ite_kw_first_closing.ml.opts b/test/passing/ite-kw_first_closing.ml.opts
similarity index 100%
rename from test/passing/ite_kw_first_closing.ml.opts
rename to test/passing/ite-kw_first_closing.ml.opts
diff --git a/test/passing/ite_kw_first_closing.ml.ref b/test/passing/ite-kw_first_closing.ml.ref
similarity index 100%
rename from test/passing/ite_kw_first_closing.ml.ref
rename to test/passing/ite-kw_first_closing.ml.ref
diff --git a/test/passing/ite_kw_first_no_indicate.ml.opts b/test/passing/ite-kw_first_no_indicate.ml.opts
similarity index 100%
rename from test/passing/ite_kw_first_no_indicate.ml.opts
rename to test/passing/ite-kw_first_no_indicate.ml.opts
diff --git a/test/passing/ite_kw_first_no_indicate.ml.ref b/test/passing/ite-kw_first_no_indicate.ml.ref
similarity index 100%
rename from test/passing/ite_kw_first_no_indicate.ml.ref
rename to test/passing/ite-kw_first_no_indicate.ml.ref
diff --git a/test/passing/ite_no_indicate.ml.opts b/test/passing/ite-no_indicate.ml.opts
similarity index 100%
rename from test/passing/ite_no_indicate.ml.opts
rename to test/passing/ite-no_indicate.ml.opts
diff --git a/test/passing/ite_no_indicate.ml.ref b/test/passing/ite-no_indicate.ml.ref
similarity index 100%
rename from test/passing/ite_no_indicate.ml.ref
rename to test/passing/ite-no_indicate.ml.ref
diff --git a/test/passing/ite_fit_or_vertical.ml b/test/passing/ite_fit_or_vertical.ml
deleted file mode 120000
index 8e3c7abbbb..0000000000
--- a/test/passing/ite_fit_or_vertical.ml
+++ /dev/null
@@ -1 +0,0 @@
-ite.ml
\ No newline at end of file
diff --git a/test/passing/ite_fit_or_vertical_closing.ml b/test/passing/ite_fit_or_vertical_closing.ml
deleted file mode 120000
index 8e3c7abbbb..0000000000
--- a/test/passing/ite_fit_or_vertical_closing.ml
+++ /dev/null
@@ -1 +0,0 @@
-ite.ml
\ No newline at end of file
diff --git a/test/passing/ite_fit_or_vertical_no_indicate.ml b/test/passing/ite_fit_or_vertical_no_indicate.ml
deleted file mode 120000
index 8e3c7abbbb..0000000000
--- a/test/passing/ite_fit_or_vertical_no_indicate.ml
+++ /dev/null
@@ -1 +0,0 @@
-ite.ml
\ No newline at end of file
diff --git a/test/passing/ite_kr.ml b/test/passing/ite_kr.ml
deleted file mode 120000
index 8e3c7abbbb..0000000000
--- a/test/passing/ite_kr.ml
+++ /dev/null
@@ -1 +0,0 @@
-ite.ml
\ No newline at end of file
diff --git a/test/passing/ite_kr_closing.ml b/test/passing/ite_kr_closing.ml
deleted file mode 120000
index 8e3c7abbbb..0000000000
--- a/test/passing/ite_kr_closing.ml
+++ /dev/null
@@ -1 +0,0 @@
-ite.ml
\ No newline at end of file
diff --git a/test/passing/ite_kw_first.ml b/test/passing/ite_kw_first.ml
deleted file mode 120000
index 8e3c7abbbb..0000000000
--- a/test/passing/ite_kw_first.ml
+++ /dev/null
@@ -1 +0,0 @@
-ite.ml
\ No newline at end of file
diff --git a/test/passing/ite_kw_first_closing.ml b/test/passing/ite_kw_first_closing.ml
deleted file mode 120000
index 8e3c7abbbb..0000000000
--- a/test/passing/ite_kw_first_closing.ml
+++ /dev/null
@@ -1 +0,0 @@
-ite.ml
\ No newline at end of file
diff --git a/test/passing/ite_kw_first_no_indicate.ml b/test/passing/ite_kw_first_no_indicate.ml
deleted file mode 120000
index 8e3c7abbbb..0000000000
--- a/test/passing/ite_kw_first_no_indicate.ml
+++ /dev/null
@@ -1 +0,0 @@
-ite.ml
\ No newline at end of file
diff --git a/test/passing/ite_no_indicate.ml b/test/passing/ite_no_indicate.ml
deleted file mode 120000
index 8e3c7abbbb..0000000000
--- a/test/passing/ite_no_indicate.ml
+++ /dev/null
@@ -1 +0,0 @@
-ite.ml
\ No newline at end of file
diff --git a/test/passing/let_binding_in_indent.ml.opts b/test/passing/let_binding-in_indent.ml.opts
similarity index 100%
rename from test/passing/let_binding_in_indent.ml.opts
rename to test/passing/let_binding-in_indent.ml.opts
diff --git a/test/passing/let_binding_in_indent.ml.ref b/test/passing/let_binding-in_indent.ml.ref
similarity index 100%
rename from test/passing/let_binding_in_indent.ml.ref
rename to test/passing/let_binding-in_indent.ml.ref
diff --git a/test/passing/let_binding_indent.ml.opts b/test/passing/let_binding-indent.ml.opts
similarity index 100%
rename from test/passing/let_binding_indent.ml.opts
rename to test/passing/let_binding-indent.ml.opts
diff --git a/test/passing/let_binding_indent.ml.ref b/test/passing/let_binding-indent.ml.ref
similarity index 100%
rename from test/passing/let_binding_indent.ml.ref
rename to test/passing/let_binding-indent.ml.ref
diff --git a/test/passing/let_binding_in_indent.ml b/test/passing/let_binding_in_indent.ml
deleted file mode 120000
index c023a33ec8..0000000000
--- a/test/passing/let_binding_in_indent.ml
+++ /dev/null
@@ -1 +0,0 @@
-let_binding.ml
\ No newline at end of file
diff --git a/test/passing/let_binding_indent.ml b/test/passing/let_binding_indent.ml
deleted file mode 120000
index c023a33ec8..0000000000
--- a/test/passing/let_binding_indent.ml
+++ /dev/null
@@ -1 +0,0 @@
-let_binding.ml
\ No newline at end of file
diff --git a/test/passing/let_module_sparse.ml.opts b/test/passing/let_module-sparse.ml.opts
similarity index 100%
rename from test/passing/let_module_sparse.ml.opts
rename to test/passing/let_module-sparse.ml.opts
diff --git a/test/passing/let_module_sparse.ml.ref b/test/passing/let_module-sparse.ml.ref
similarity index 100%
rename from test/passing/let_module_sparse.ml.ref
rename to test/passing/let_module-sparse.ml.ref
diff --git a/test/passing/let_module_compact.ml b/test/passing/let_module.ml
similarity index 100%
rename from test/passing/let_module_compact.ml
rename to test/passing/let_module.ml
diff --git a/test/passing/let_module_compact.ml.opts b/test/passing/let_module.ml.opts
similarity index 100%
rename from test/passing/let_module_compact.ml.opts
rename to test/passing/let_module.ml.opts
diff --git a/test/passing/let_module_compact.ml.ref b/test/passing/let_module.ml.ref
similarity index 100%
rename from test/passing/let_module_compact.ml.ref
rename to test/passing/let_module.ml.ref
diff --git a/test/passing/let_module_sparse.ml b/test/passing/let_module_sparse.ml
deleted file mode 120000
index 962b7e0e2b..0000000000
--- a/test/passing/let_module_sparse.ml
+++ /dev/null
@@ -1 +0,0 @@
-let_module_compact.ml
\ No newline at end of file
diff --git a/test/passing/list-space_around.ml b/test/passing/list-space_around.ml
deleted file mode 120000
index 4ff420cdaa..0000000000
--- a/test/passing/list-space_around.ml
+++ /dev/null
@@ -1 +0,0 @@
-list.ml
\ No newline at end of file
diff --git a/test/passing/match_indent_never.ml.opts b/test/passing/match_indent-never.ml.opts
similarity index 100%
rename from test/passing/match_indent_never.ml.opts
rename to test/passing/match_indent-never.ml.opts
diff --git a/test/passing/match_indent_never.ml.ref b/test/passing/match_indent-never.ml.ref
similarity index 100%
rename from test/passing/match_indent_never.ml.ref
rename to test/passing/match_indent-never.ml.ref
diff --git a/test/passing/match_indent_always.ml b/test/passing/match_indent.ml
similarity index 100%
rename from test/passing/match_indent_always.ml
rename to test/passing/match_indent.ml
diff --git a/test/passing/match_indent_always.ml.opts b/test/passing/match_indent.ml.opts
similarity index 100%
rename from test/passing/match_indent_always.ml.opts
rename to test/passing/match_indent.ml.opts
diff --git a/test/passing/match_indent_always.ml.ref b/test/passing/match_indent.ml.ref
similarity index 100%
rename from test/passing/match_indent_always.ml.ref
rename to test/passing/match_indent.ml.ref
diff --git a/test/passing/match_indent_never.ml b/test/passing/match_indent_never.ml
deleted file mode 120000
index e429d47fb1..0000000000
--- a/test/passing/match_indent_never.ml
+++ /dev/null
@@ -1 +0,0 @@
-match_indent_always.ml
\ No newline at end of file
diff --git a/test/passing/module_item_spacing_preserve.ml.opts b/test/passing/module_item_spacing-preserve.ml.opts
similarity index 100%
rename from test/passing/module_item_spacing_preserve.ml.opts
rename to test/passing/module_item_spacing-preserve.ml.opts
diff --git a/test/passing/module_item_spacing_preserve.ml.ref b/test/passing/module_item_spacing-preserve.ml.ref
similarity index 100%
rename from test/passing/module_item_spacing_preserve.ml.ref
rename to test/passing/module_item_spacing-preserve.ml.ref
diff --git a/test/passing/module_item_spacing_sparse.ml.opts b/test/passing/module_item_spacing-sparse.ml.opts
similarity index 100%
rename from test/passing/module_item_spacing_sparse.ml.opts
rename to test/passing/module_item_spacing-sparse.ml.opts
diff --git a/test/passing/module_item_spacing_sparse.ml.ref b/test/passing/module_item_spacing-sparse.ml.ref
similarity index 100%
rename from test/passing/module_item_spacing_sparse.ml.ref
rename to test/passing/module_item_spacing-sparse.ml.ref
diff --git a/test/passing/module_item_spacing_compact.ml b/test/passing/module_item_spacing.ml
similarity index 100%
rename from test/passing/module_item_spacing_compact.ml
rename to test/passing/module_item_spacing.ml
diff --git a/test/passing/module_item_spacing_compact.ml.opts b/test/passing/module_item_spacing.ml.opts
similarity index 100%
rename from test/passing/module_item_spacing_compact.ml.opts
rename to test/passing/module_item_spacing.ml.opts
diff --git a/test/passing/module_item_spacing_compact.ml.ref b/test/passing/module_item_spacing.ml.ref
similarity index 100%
rename from test/passing/module_item_spacing_compact.ml.ref
rename to test/passing/module_item_spacing.ml.ref
diff --git a/test/passing/module_item_spacing_preserve.ml b/test/passing/module_item_spacing_preserve.ml
deleted file mode 120000
index fdb8bf0910..0000000000
--- a/test/passing/module_item_spacing_preserve.ml
+++ /dev/null
@@ -1 +0,0 @@
-module_item_spacing_compact.ml
\ No newline at end of file
diff --git a/test/passing/module_item_spacing_sparse.ml b/test/passing/module_item_spacing_sparse.ml
deleted file mode 120000
index fdb8bf0910..0000000000
--- a/test/passing/module_item_spacing_sparse.ml
+++ /dev/null
@@ -1 +0,0 @@
-module_item_spacing_compact.ml
\ No newline at end of file
diff --git a/test/passing/open_auto.ml.opts b/test/passing/open-auto.ml.opts
similarity index 100%
rename from test/passing/open_auto.ml.opts
rename to test/passing/open-auto.ml.opts
diff --git a/test/passing/open_auto.ml.ref b/test/passing/open-auto.ml.ref
similarity index 100%
rename from test/passing/open_auto.ml.ref
rename to test/passing/open-auto.ml.ref
diff --git a/test/passing/open_long.ml.opts b/test/passing/open-long.ml.opts
similarity index 100%
rename from test/passing/open_long.ml.opts
rename to test/passing/open-long.ml.opts
diff --git a/test/passing/open_long.ml.ref b/test/passing/open-long.ml.ref
similarity index 100%
rename from test/passing/open_long.ml.ref
rename to test/passing/open-long.ml.ref
diff --git a/test/passing/open_preserve.ml.opts b/test/passing/open-preserve.ml.opts
similarity index 100%
rename from test/passing/open_preserve.ml.opts
rename to test/passing/open-preserve.ml.opts
diff --git a/test/passing/open_preserve.ml.ref b/test/passing/open-preserve.ml.ref
similarity index 100%
rename from test/passing/open_preserve.ml.ref
rename to test/passing/open-preserve.ml.ref
diff --git a/test/passing/open_short.ml.opts b/test/passing/open-short.ml.opts
similarity index 100%
rename from test/passing/open_short.ml.opts
rename to test/passing/open-short.ml.opts
diff --git a/test/passing/open_short.ml.ref b/test/passing/open-short.ml.ref
similarity index 100%
rename from test/passing/open_short.ml.ref
rename to test/passing/open-short.ml.ref
diff --git a/test/passing/open_auto.ml b/test/passing/open_auto.ml
deleted file mode 120000
index c249bae12f..0000000000
--- a/test/passing/open_auto.ml
+++ /dev/null
@@ -1 +0,0 @@
-open.ml
\ No newline at end of file
diff --git a/test/passing/open_long.ml b/test/passing/open_long.ml
deleted file mode 120000
index c249bae12f..0000000000
--- a/test/passing/open_long.ml
+++ /dev/null
@@ -1 +0,0 @@
-open.ml
\ No newline at end of file
diff --git a/test/passing/open_preserve.ml b/test/passing/open_preserve.ml
deleted file mode 120000
index c249bae12f..0000000000
--- a/test/passing/open_preserve.ml
+++ /dev/null
@@ -1 +0,0 @@
-open.ml
\ No newline at end of file
diff --git a/test/passing/open_short.ml b/test/passing/open_short.ml
deleted file mode 120000
index c249bae12f..0000000000
--- a/test/passing/open_short.ml
+++ /dev/null
@@ -1 +0,0 @@
-open.ml
\ No newline at end of file
diff --git a/test/passing/record_loose.ml.opts b/test/passing/record-loose.ml.opts
similarity index 100%
rename from test/passing/record_loose.ml.opts
rename to test/passing/record-loose.ml.opts
diff --git a/test/passing/record_loose.ml.ref b/test/passing/record-loose.ml.ref
similarity index 100%
rename from test/passing/record_loose.ml.ref
rename to test/passing/record-loose.ml.ref
diff --git a/test/passing/record_tight_decl.ml.opts b/test/passing/record-tight_decl.ml.opts
similarity index 100%
rename from test/passing/record_tight_decl.ml.opts
rename to test/passing/record-tight_decl.ml.opts
diff --git a/test/passing/record_tight_decl.ml.ref b/test/passing/record-tight_decl.ml.ref
similarity index 100%
rename from test/passing/record_tight_decl.ml.ref
rename to test/passing/record-tight_decl.ml.ref
diff --git a/test/passing/record_loose.ml b/test/passing/record_loose.ml
deleted file mode 120000
index d9632b33f3..0000000000
--- a/test/passing/record_loose.ml
+++ /dev/null
@@ -1 +0,0 @@
-record.ml
\ No newline at end of file
diff --git a/test/passing/record_tight_decl.ml b/test/passing/record_tight_decl.ml
deleted file mode 120000
index d9632b33f3..0000000000
--- a/test/passing/record_tight_decl.ml
+++ /dev/null
@@ -1 +0,0 @@
-record.ml
\ No newline at end of file
diff --git a/test/passing/sequence_preserve.ml.opts b/test/passing/sequence-preserve.ml.opts
similarity index 100%
rename from test/passing/sequence_preserve.ml.opts
rename to test/passing/sequence-preserve.ml.opts
diff --git a/test/passing/sequence_preserve.ml.ref b/test/passing/sequence-preserve.ml.ref
similarity index 100%
rename from test/passing/sequence_preserve.ml.ref
rename to test/passing/sequence-preserve.ml.ref
diff --git a/test/passing/sequence_preserve.ml b/test/passing/sequence_preserve.ml
deleted file mode 120000
index 663d7cb409..0000000000
--- a/test/passing/sequence_preserve.ml
+++ /dev/null
@@ -1 +0,0 @@
-sequence.ml
\ No newline at end of file
diff --git a/test/passing/types-compact-space_around-docked.ml b/test/passing/types-compact-space_around-docked.ml
deleted file mode 120000
index fa2b7ea52b..0000000000
--- a/test/passing/types-compact-space_around-docked.ml
+++ /dev/null
@@ -1 +0,0 @@
-types.ml
\ No newline at end of file
diff --git a/test/passing/types-compact-space_around.ml b/test/passing/types-compact-space_around.ml
deleted file mode 120000
index fa2b7ea52b..0000000000
--- a/test/passing/types-compact-space_around.ml
+++ /dev/null
@@ -1 +0,0 @@
-types.ml
\ No newline at end of file
diff --git a/test/passing/types-compact.ml b/test/passing/types-compact.ml
deleted file mode 120000
index fa2b7ea52b..0000000000
--- a/test/passing/types-compact.ml
+++ /dev/null
@@ -1 +0,0 @@
-types.ml
\ No newline at end of file
diff --git a/test/passing/types_indent.ml.opts b/test/passing/types-indent.ml.opts
similarity index 100%
rename from test/passing/types_indent.ml.opts
rename to test/passing/types-indent.ml.opts
diff --git a/test/passing/types_indent.ml.ref b/test/passing/types-indent.ml.ref
similarity index 100%
rename from test/passing/types_indent.ml.ref
rename to test/passing/types-indent.ml.ref
diff --git a/test/passing/types-sparse-space_around.ml b/test/passing/types-sparse-space_around.ml
deleted file mode 120000
index fa2b7ea52b..0000000000
--- a/test/passing/types-sparse-space_around.ml
+++ /dev/null
@@ -1 +0,0 @@
-types.ml
\ No newline at end of file
diff --git a/test/passing/types-sparse.ml b/test/passing/types-sparse.ml
deleted file mode 120000
index fa2b7ea52b..0000000000
--- a/test/passing/types-sparse.ml
+++ /dev/null
@@ -1 +0,0 @@
-types.ml
\ No newline at end of file
diff --git a/test/passing/types_indent.ml b/test/passing/types_indent.ml
deleted file mode 120000
index fa2b7ea52b..0000000000
--- a/test/passing/types_indent.ml
+++ /dev/null
@@ -1 +0,0 @@
-types.ml
\ No newline at end of file

From 44a502393a43cc04323be5412577bf2c728ccf99 Mon Sep 17 00:00:00 2001
From: Guillaume Petiot <guillpetiot@gmail.com>
Date: Wed, 21 Aug 2019 23:04:35 +0700
Subject: [PATCH 2/5] reduce diff

---
 test/passing/dune | 88 +++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 49 deletions(-)

diff --git a/test/passing/dune b/test/passing/dune
index 23467fd01b..1c58b608f5 100644
--- a/test/passing/dune
+++ b/test/passing/dune
@@ -1,8 +1,13 @@
 (* -*- tuareg -*- *)
 
-type out = {ref: string option; opts: string option}
+type setup =
+  { mutable has_ref: bool
+  ; mutable has_opts: bool
+  ; mutable base_file: string option
+  ; mutable extra_deps: string list }
 
-type setup = {mutable outputs: out list; mutable extra_deps: string list}
+let default_setup () =
+  {has_ref= false; has_opts= false; base_file= None; extra_deps= []}
 
 let read_lines fn =
   let rec aux acc ic =
@@ -23,46 +28,34 @@ let register_file tests fname =
           (* foo_file-some_variant.ml should derive from foo_file.ml *)
           match String.index_opt test_name '-' with
           | None ->
-              let s = {outputs= []; extra_deps= []} in
+              let s =
+                { has_ref= false
+                ; has_opts= false
+                ; base_file= None
+                ; extra_deps= [] }
+              in
               Hashtbl.add tests src_test_name s ;
               s
           | Some i -> (
-              let src_test_name = String.sub test_name 0 i ^ "." ^ ext in
-              match Hashtbl.find tests src_test_name with
+              let base_src_test_name =
+                String.sub test_name 0 i ^ "." ^ ext
+              in
+              match Hashtbl.find tests base_src_test_name with
               | setup -> setup
               | exception Not_found ->
-                  let s = {outputs= []; extra_deps= []} in
+                  let s =
+                    { has_ref= false
+                    ; has_opts= false
+                    ; base_file= Some base_src_test_name
+                    ; extra_deps= [] }
+                  in
                   Hashtbl.add tests src_test_name s ;
                   s ) )
       in
       match rest with
       | [] -> ()
-      | ["opts"] ->
-          let ref_name = test_name ^ "." ^ ext ^ ".ref" in
-          let ref_exists {ref; _} =
-            Option.equal String.equal ref (Some ref_name)
-          in
-          let outputs =
-            if List.exists ref_exists setup.outputs then
-              let opts = Some fname in
-              let update o = if ref_exists o then {o with opts} else o in
-              List.map update setup.outputs
-            else {ref= None; opts= Some fname} :: setup.outputs
-          in
-          setup.outputs <- outputs
-      | ["ref"] ->
-          let opts_name = test_name ^ "." ^ ext ^ ".opts" in
-          let opts_exists {opts; _} =
-            Option.equal String.equal opts (Some opts_name)
-          in
-          let outputs =
-            if List.exists opts_exists setup.outputs then
-              let ref = Some fname in
-              let update o = if opts_exists o then {o with ref} else o in
-              List.map update setup.outputs
-            else {ref= Some fname; opts= None} :: setup.outputs
-          in
-          setup.outputs <- outputs
+      | ["opts"] -> setup.has_opts <- true
+      | ["ref"] -> setup.has_ref <- true
       | ["deps"] -> setup.extra_deps <- read_lines fname
       | _ -> invalid_arg fname )
   | _ -> ()
@@ -71,20 +64,18 @@ let register_file tests fname =
 
 let emit_test buffer test_name setup =
   let open Printf in
+  let opts =
+    if setup.has_opts then sprintf " %%{read-lines:%s.opts}" test_name
+    else ""
+  in
+  let ref_name = if setup.has_ref then test_name ^ ".ref" else test_name in
+  let base_test_name = Option.value setup.base_file ~default:test_name in
   let extra_deps = String.concat " " setup.extra_deps in
-  List.iteri
-    (fun i output ->
-      let opts =
-        match output.opts with
-        | Some o -> sprintf " %%{read-lines:%s}" o
-        | None -> ""
-      in
-      let ref_name = Option.value output.ref ~default:test_name in
-      Printf.ksprintf
-        (Buffer.add_string buffer)
-        {|
+  Printf.ksprintf
+    (Buffer.add_string buffer)
+    {|
 (rule
- (targets %s.%i.output)
+ (targets %s.output)
  (deps (:input %s) .ocamlformat %s)
  (action
    (setenv OCAMLFORMAT "max-iters=2"
@@ -93,12 +84,11 @@ let emit_test buffer test_name setup =
 
 (alias
  (name runtest)
- (deps %s %s.%i.output)
- (action (diff %s %s.%i.output)))
+ (deps %s %s.output)
+ (action (diff %s %s.output)))
 |}
-        test_name i test_name extra_deps opts ref_name test_name i ref_name
-        test_name i)
-    setup.outputs
+    test_name base_test_name extra_deps opts ref_name test_name ref_name
+    test_name
 
 let tests = Hashtbl.create 64
 

From e426c817684201522a5976e1ddd6f2fb137ae615 Mon Sep 17 00:00:00 2001
From: Guillaume Petiot <guillpetiot@gmail.com>
Date: Wed, 21 Aug 2019 23:55:11 +0700
Subject: [PATCH 3/5] fix

---
 ...ists-arrays.ml => compact_lists_arrays.ml} |  0
 test/passing/dune                             | 24 +++++++------------
 2 files changed, 9 insertions(+), 15 deletions(-)
 rename test/passing/{compact-lists-arrays.ml => compact_lists_arrays.ml} (100%)

diff --git a/test/passing/compact-lists-arrays.ml b/test/passing/compact_lists_arrays.ml
similarity index 100%
rename from test/passing/compact-lists-arrays.ml
rename to test/passing/compact_lists_arrays.ml
diff --git a/test/passing/dune b/test/passing/dune
index 1c58b608f5..eaedfb46fd 100644
--- a/test/passing/dune
+++ b/test/passing/dune
@@ -6,9 +6,6 @@ type setup =
   ; mutable base_file: string option
   ; mutable extra_deps: string list }
 
-let default_setup () =
-  {has_ref= false; has_opts= false; base_file= None; extra_deps= []}
-
 let read_lines fn =
   let rec aux acc ic =
     try aux (input_line ic :: acc) ic with End_of_file -> acc
@@ -36,21 +33,18 @@ let register_file tests fname =
               in
               Hashtbl.add tests src_test_name s ;
               s
-          | Some i -> (
+          | Some i ->
               let base_src_test_name =
                 String.sub test_name 0 i ^ "." ^ ext
               in
-              match Hashtbl.find tests base_src_test_name with
-              | setup -> setup
-              | exception Not_found ->
-                  let s =
-                    { has_ref= false
-                    ; has_opts= false
-                    ; base_file= Some base_src_test_name
-                    ; extra_deps= [] }
-                  in
-                  Hashtbl.add tests src_test_name s ;
-                  s ) )
+              let s =
+                { has_ref= false
+                ; has_opts= false
+                ; base_file= Some base_src_test_name
+                ; extra_deps= [] }
+              in
+              Hashtbl.add tests src_test_name s ;
+              s )
       in
       match rest with
       | [] -> ()

From 4d479519997c1950af97260dd725c722a2ed1e1f Mon Sep 17 00:00:00 2001
From: Guillaume Petiot <guillpetiot@gmail.com>
Date: Thu, 22 Aug 2019 16:00:23 +0700
Subject: [PATCH 4/5] run .mlt tests

---
 test/passing/dune | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/passing/dune b/test/passing/dune
index eaedfb46fd..4f741ef8ef 100644
--- a/test/passing/dune
+++ b/test/passing/dune
@@ -16,7 +16,7 @@ let read_lines fn =
 
 let register_file tests fname =
   match String.split_on_char '.' fname with
-  | test_name :: (("ml" | "mli") as ext) :: rest -> (
+  | test_name :: (("ml" | "mli" | "mlt") as ext) :: rest -> (
       let src_test_name = test_name ^ "." ^ ext in
       let setup =
         match Hashtbl.find tests src_test_name with

From 5ee78c70eea1a51b783acbf1557abe9d76e4c183 Mon Sep 17 00:00:00 2001
From: Guillaume Petiot <guillpetiot@gmail.com>
Date: Thu, 22 Aug 2019 16:05:54 +0700
Subject: [PATCH 5/5] factorize

---
 test/passing/dune | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/test/passing/dune b/test/passing/dune
index 4f741ef8ef..b4652f0ae3 100644
--- a/test/passing/dune
+++ b/test/passing/dune
@@ -14,6 +14,11 @@ let read_lines fn =
   let lines = aux [] ic in
   close_in ic ; lines
 
+let add_test ?base_file tests src_test_name =
+  let s = {has_ref= false; has_opts= false; base_file; extra_deps= []} in
+  Hashtbl.add tests src_test_name s ;
+  s
+
 let register_file tests fname =
   match String.split_on_char '.' fname with
   | test_name :: (("ml" | "mli" | "mlt") as ext) :: rest -> (
@@ -24,27 +29,10 @@ let register_file tests fname =
         | exception Not_found -> (
           (* foo_file-some_variant.ml should derive from foo_file.ml *)
           match String.index_opt test_name '-' with
-          | None ->
-              let s =
-                { has_ref= false
-                ; has_opts= false
-                ; base_file= None
-                ; extra_deps= [] }
-              in
-              Hashtbl.add tests src_test_name s ;
-              s
+          | None -> add_test tests src_test_name
           | Some i ->
-              let base_src_test_name =
-                String.sub test_name 0 i ^ "." ^ ext
-              in
-              let s =
-                { has_ref= false
-                ; has_opts= false
-                ; base_file= Some base_src_test_name
-                ; extra_deps= [] }
-              in
-              Hashtbl.add tests src_test_name s ;
-              s )
+              let base_file = String.sub test_name 0 i ^ "." ^ ext in
+              add_test ~base_file tests src_test_name )
       in
       match rest with
       | [] -> ()