Tests: remove symbolic links and change naming convention of tests (o…

…caml-ppx#980)
bogdan2412 · Mar 28, 2020 · 4391dc2 · 4391dc2
1 parent 810a8ba
commit 4391dc2
Show file tree

Hide file tree

Showing 187 changed files with 54 additions and 68 deletions.
diff --git a/test/passing/align_cases_break_all.ml.opts → test/passing/align_cases-break_all.ml.opts b/test/passing/align_cases_break_all.ml.opts → test/passing/align_cases-break_all.ml.opts
diff --git a/test/passing/align_cases_break_all.ml.ref → test/passing/align_cases-break_all.ml.ref b/test/passing/align_cases_break_all.ml.ref → 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
diff --git a/...assing/assign_colon_op_begin_line.ml.opts → ...assing/assign_colon-op_begin_line.ml.opts b/...assing/assign_colon_op_begin_line.ml.opts → ...assing/assign_colon-op_begin_line.ml.opts
diff --git a/...passing/assign_colon_op_begin_line.ml.ref → ...passing/assign_colon-op_begin_line.ml.ref b/...passing/assign_colon_op_begin_line.ml.ref → ...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
diff --git a/test/passing/break_before_in_auto.ml.opts → test/passing/break_before_in-auto.ml.opts b/test/passing/break_before_in_auto.ml.opts → test/passing/break_before_in-auto.ml.opts
diff --git a/test/passing/break_before_in_auto.ml.ref → test/passing/break_before_in-auto.ml.ref b/test/passing/break_before_in_auto.ml.ref → test/passing/break_before_in-auto.ml.ref
diff --git a/...assing/break_before_in_fit_or_vertical.ml → test/passing/break_before_in.ml b/...assing/break_before_in_fit_or_vertical.ml → test/passing/break_before_in.ml
diff --git a/...g/break_before_in_fit_or_vertical.ml.opts → test/passing/break_before_in.ml.opts b/...g/break_before_in_fit_or_vertical.ml.opts → 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
diff --git a/test/passing/break_cases_align.ml.opts → test/passing/break_cases-align.ml.opts b/test/passing/break_cases_align.ml.opts → test/passing/break_cases-align.ml.opts
diff --git a/test/passing/break_cases_align.ml.ref → test/passing/break_cases-align.ml.ref b/test/passing/break_cases_align.ml.ref → test/passing/break_cases-align.ml.ref
diff --git a/test/passing/break_cases_all.ml.opts → test/passing/break_cases-all.ml.opts b/test/passing/break_cases_all.ml.opts → test/passing/break_cases-all.ml.opts
diff --git a/test/passing/break_cases_all.ml.ref → test/passing/break_cases-all.ml.ref b/test/passing/break_cases_all.ml.ref → test/passing/break_cases-all.ml.ref
diff --git a/...ak_cases_closing_on_separate_line.ml.opts → ...ak_cases-closing_on_separate_line.ml.opts b/...ak_cases_closing_on_separate_line.ml.opts → ...ak_cases-closing_on_separate_line.ml.opts
diff --git a/...eak_cases_closing_on_separate_line.ml.ref → ...eak_cases-closing_on_separate_line.ml.ref b/...eak_cases_closing_on_separate_line.ml.ref → ...eak_cases-closing_on_separate_line.ml.ref
diff --git a/..._line_leading_nested_match_parens.ml.opts → ..._line_leading_nested_match_parens.ml.opts b/..._line_leading_nested_match_parens.ml.opts → ..._line_leading_nested_match_parens.ml.opts
diff --git a/...e_line_leading_nested_match_parens.ml.ref → ...e_line_leading_nested_match_parens.ml.ref b/...e_line_leading_nested_match_parens.ml.ref → ...e_line_leading_nested_match_parens.ml.ref
diff --git a/...assing/break_cases_cosl_lnmp_cmei.ml.opts → ...assing/break_cases-cosl_lnmp_cmei.ml.opts b/...assing/break_cases_cosl_lnmp_cmei.ml.opts → ...assing/break_cases-cosl_lnmp_cmei.ml.opts
diff --git a/...passing/break_cases_cosl_lnmp_cmei.ml.ref → ...passing/break_cases-cosl_lnmp_cmei.ml.ref b/...passing/break_cases_cosl_lnmp_cmei.ml.ref → ...passing/break_cases-cosl_lnmp_cmei.ml.ref
diff --git a/...ssing/break_cases_fit_or_vertical.ml.opts → ...ssing/break_cases-fit_or_vertical.ml.opts b/...ssing/break_cases_fit_or_vertical.ml.opts → ...ssing/break_cases-fit_or_vertical.ml.opts
diff --git a/...assing/break_cases_fit_or_vertical.ml.ref → ...assing/break_cases-fit_or_vertical.ml.ref b/...assing/break_cases_fit_or_vertical.ml.ref → ...assing/break_cases-fit_or_vertical.ml.ref
diff --git a/test/passing/break_cases_nested.ml.opts → test/passing/break_cases-nested.ml.opts b/test/passing/break_cases_nested.ml.opts → test/passing/break_cases-nested.ml.opts
diff --git a/test/passing/break_cases_nested.ml.ref → test/passing/break_cases-nested.ml.ref b/test/passing/break_cases_nested.ml.ref → test/passing/break_cases-nested.ml.ref
diff --git a/...passing/break_cases_normal_indent.ml.opts → ...passing/break_cases-normal_indent.ml.opts b/...passing/break_cases_normal_indent.ml.opts → ...passing/break_cases-normal_indent.ml.opts
diff --git a/.../passing/break_cases_normal_indent.ml.ref → .../passing/break_cases-normal_indent.ml.ref b/.../passing/break_cases_normal_indent.ml.ref → .../passing/break_cases-normal_indent.ml.ref
diff --git a/test/passing/break_cases_toplevel.ml.opts → test/passing/break_cases-toplevel.ml.opts b/test/passing/break_cases_toplevel.ml.opts → test/passing/break_cases-toplevel.ml.opts
diff --git a/test/passing/break_cases_toplevel.ml.ref → test/passing/break_cases-toplevel.ml.ref b/test/passing/break_cases_toplevel.ml.ref → test/passing/break_cases-toplevel.ml.ref
diff --git a/test/passing/break_cases_fit.ml → test/passing/break_cases.ml b/test/passing/break_cases_fit.ml → test/passing/break_cases.ml
diff --git a/test/passing/break_cases_fit.ml.opts → test/passing/break_cases.ml.opts b/test/passing/break_cases_fit.ml.opts → test/passing/break_cases.ml.opts
diff --git a/test/passing/break_cases_fit.ml.ref → test/passing/break_cases.ml.ref b/test/passing/break_cases_fit.ml.ref → test/passing/break_cases.ml.ref
diff --git a/test/passing/break_cases_align.ml b/test/passing/break_cases_align.ml
diff --git a/test/passing/break_cases_all.ml b/test/passing/break_cases_all.ml
diff --git a/test/passing/break_cases_closing_on_separate_line.ml b/test/passing/break_cases_closing_on_separate_line.ml
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
diff --git a/test/passing/break_cases_cosl_lnmp_cmei.ml b/test/passing/break_cases_cosl_lnmp_cmei.ml
diff --git a/test/passing/break_cases_fit_or_vertical.ml b/test/passing/break_cases_fit_or_vertical.ml
diff --git a/test/passing/break_cases_nested.ml b/test/passing/break_cases_nested.ml
diff --git a/test/passing/break_cases_normal_indent.ml b/test/passing/break_cases_normal_indent.ml
diff --git a/test/passing/break_cases_toplevel.ml b/test/passing/break_cases_toplevel.ml
diff --git a/test/passing/break_fun_decl-fit_or_vertical.ml b/test/passing/break_fun_decl-fit_or_vertical.ml
diff --git a/test/passing/break_fun_decl-smart.ml b/test/passing/break_fun_decl-smart.ml
diff --git a/test/passing/break_fun_decl-wrap.ml b/test/passing/break_fun_decl-wrap.ml
diff --git a/test/passing/break_separators_after.ml.opts → test/passing/break_separators-after.ml.opts b/test/passing/break_separators_after.ml.opts → test/passing/break_separators-after.ml.opts
diff --git a/test/passing/break_separators_after.ml.ref → test/passing/break_separators-after.ml.ref b/test/passing/break_separators_after.ml.ref → test/passing/break_separators-after.ml.ref
diff --git a/...ing/break_separators_after_docked.ml.opts → ...ing/break_separators-after_docked.ml.opts b/...ing/break_separators_after_docked.ml.opts → ...ing/break_separators-after_docked.ml.opts
diff --git a/...sing/break_separators_after_docked.ml.ref → ...sing/break_separators-after_docked.ml.ref b/...sing/break_separators_after_docked.ml.ref → ...sing/break_separators-after_docked.ml.ref
diff --git a/...reak_separators_after_docked_wrap.ml.opts → ...reak_separators-after_docked_wrap.ml.opts b/...reak_separators_after_docked_wrap.ml.opts → ...reak_separators-after_docked_wrap.ml.opts
diff --git a/...break_separators_after_docked_wrap.ml.ref → ...break_separators-after_docked_wrap.ml.ref b/...break_separators_after_docked_wrap.ml.ref → ...break_separators-after_docked_wrap.ml.ref
diff --git a/...ssing/break_separators_after_wrap.ml.opts → ...ssing/break_separators-after_wrap.ml.opts b/...ssing/break_separators_after_wrap.ml.opts → ...ssing/break_separators-after_wrap.ml.opts
diff --git a/...assing/break_separators_after_wrap.ml.ref → ...assing/break_separators-after_wrap.ml.ref b/...assing/break_separators_after_wrap.ml.ref → ...assing/break_separators-after_wrap.ml.ref
diff --git a/test/passing/break_separators_wrap.ml.opts → test/passing/break_separators-wrap.ml.opts b/test/passing/break_separators_wrap.ml.opts → test/passing/break_separators-wrap.ml.opts
diff --git a/test/passing/break_separators_wrap.ml.ref → test/passing/break_separators-wrap.ml.ref b/test/passing/break_separators_wrap.ml.ref → test/passing/break_separators-wrap.ml.ref
diff --git a/test/passing/break_separators_after.ml b/test/passing/break_separators_after.ml
diff --git a/test/passing/break_separators_after_docked.ml b/test/passing/break_separators_after_docked.ml
diff --git a/test/passing/break_separators_after_docked_wrap.ml b/test/passing/break_separators_after_docked_wrap.ml
diff --git a/test/passing/break_separators_after_wrap.ml b/test/passing/break_separators_after_wrap.ml
diff --git a/test/passing/break_separators_wrap.ml b/test/passing/break_separators_wrap.ml
diff --git a/...ssing/break_string_literals_never.ml.opts → ...ssing/break_string_literals-never.ml.opts b/...ssing/break_string_literals_never.ml.opts → ...ssing/break_string_literals-never.ml.opts
diff --git a/...assing/break_string_literals_never.ml.ref → ...assing/break_string_literals-never.ml.ref b/...assing/break_string_literals_never.ml.ref → ...assing/break_string_literals-never.ml.ref
diff --git a/...ng/break_string_literals_newlines.ml.opts → ...ng/break_string_literals-newlines.ml.opts b/...ng/break_string_literals_newlines.ml.opts → ...ng/break_string_literals-newlines.ml.opts
diff --git a/...ing/break_string_literals_newlines.ml.ref → ...ing/break_string_literals-newlines.ml.ref b/...ing/break_string_literals_newlines.ml.ref → ...ing/break_string_literals-newlines.ml.ref
diff --git a/...string_literals_newlines_and_wrap.ml.opts → ...string_literals-newlines_and_wrap.ml.opts b/...string_literals_newlines_and_wrap.ml.opts → ...string_literals-newlines_and_wrap.ml.opts
diff --git a/..._string_literals_newlines_and_wrap.ml.ref → ..._string_literals-newlines_and_wrap.ml.ref b/..._string_literals_newlines_and_wrap.ml.ref → ..._string_literals-newlines_and_wrap.ml.ref
diff --git a/test/passing/break_string_literals_wrap.ml → test/passing/break_string_literals.ml b/test/passing/break_string_literals_wrap.ml → test/passing/break_string_literals.ml
diff --git a/...assing/break_string_literals_wrap.ml.opts → test/passing/break_string_literals.ml.opts b/...assing/break_string_literals_wrap.ml.opts → test/passing/break_string_literals.ml.opts
diff --git a/...passing/break_string_literals_wrap.ml.ref → test/passing/break_string_literals.ml.ref b/...passing/break_string_literals_wrap.ml.ref → 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
diff --git a/test/passing/break_string_literals_newlines.ml b/test/passing/break_string_literals_newlines.ml
diff --git a/test/passing/break_string_literals_newlines_and_wrap.ml b/test/passing/break_string_literals_newlines_and_wrap.ml
diff --git a/test/passing/compact-lists-arrays.ml → test/passing/compact_lists_arrays.ml b/test/passing/compact-lists-arrays.ml → test/passing/compact_lists_arrays.ml
diff --git a/test/passing/doc_comments.after.ml.opts → test/passing/doc_comments-after.ml.opts b/test/passing/doc_comments.after.ml.opts → test/passing/doc_comments-after.ml.opts
diff --git a/test/passing/doc_comments.after.ml.ref → test/passing/doc_comments-after.ml.ref b/test/passing/doc_comments.after.ml.ref → 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 → test/passing/doc_comments-before.ml.opts b/test/passing/doc_comments.before.ml.opts → test/passing/doc_comments-before.ml.opts
diff --git a/test/passing/doc_comments.before.ml.ref → test/passing/doc_comments-before.ml.ref b/test/passing/doc_comments.before.ml.ref → 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
diff --git a/test/passing/doc_comments.before.ml b/test/passing/doc_comments.before.ml
diff --git a/test/passing/dune b/test/passing/dune
@@ -3,6 +3,7 @@
 type setup =
   { mutable has_ref: bool
   ; mutable has_opts: bool
+  ; mutable base_file: string option
   ; mutable extra_deps: string list }
 
 let read_lines fn =
@@ -13,17 +14,25 @@ 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") as ext) :: rest -> (
-      let test_name = test_name ^ "." ^ ext in
+  | test_name :: (("ml" | "mli" | "mlt") as ext) :: rest -> (
+      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 -> add_test tests src_test_name
+          | Some i ->
+              let base_file = String.sub test_name 0 i ^ "." ^ ext in
+              add_test ~base_file tests src_test_name )
       in
       match rest with
       | [] -> ()
@@ -42,6 +51,7 @@ let emit_test buffer test_name setup =
     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
   Printf.ksprintf
     (Buffer.add_string buffer)
@@ -59,7 +69,7 @@ let emit_test buffer test_name setup =
  (deps %s %s.output)
  (action (diff %s %s.output)))
 |}
-    test_name test_name extra_deps opts ref_name test_name ref_name
+    test_name base_test_name extra_deps opts ref_name test_name ref_name
     test_name
 
 let tests = Hashtbl.create 64

diff --git a/test/passing/exp_grouping_parens.ml.opts → test/passing/exp_grouping-parens.ml.opts b/test/passing/exp_grouping_parens.ml.opts → test/passing/exp_grouping-parens.ml.opts
diff --git a/test/passing/exp_grouping_parens.ml.ref → test/passing/exp_grouping-parens.ml.ref b/test/passing/exp_grouping_parens.ml.ref → test/passing/exp_grouping-parens.ml.ref
diff --git a/test/passing/exp_grouping_preserve.ml → test/passing/exp_grouping.ml b/test/passing/exp_grouping_preserve.ml → test/passing/exp_grouping.ml
diff --git a/test/passing/exp_grouping_preserve.ml.opts → test/passing/exp_grouping.ml.opts b/test/passing/exp_grouping_preserve.ml.opts → test/passing/exp_grouping.ml.opts
diff --git a/test/passing/exp_grouping_preserve.ml.ref → test/passing/exp_grouping.ml.ref b/test/passing/exp_grouping_preserve.ml.ref → test/passing/exp_grouping.ml.ref
diff --git a/test/passing/exp_grouping_parens.ml b/test/passing/exp_grouping_parens.ml
diff --git a/test/passing/extensions_indent.ml.opts → test/passing/extensions-indent.ml.opts b/test/passing/extensions_indent.ml.opts → test/passing/extensions-indent.ml.opts
diff --git a/test/passing/extensions_indent.ml.ref → test/passing/extensions-indent.ml.ref b/test/passing/extensions_indent.ml.ref → test/passing/extensions-indent.ml.ref
diff --git a/test/passing/extensions_indent.mli.opts → test/passing/extensions-indent.mli.opts b/test/passing/extensions_indent.mli.opts → test/passing/extensions-indent.mli.opts
diff --git a/test/passing/extensions_indent.mli.ref → test/passing/extensions-indent.mli.ref b/test/passing/extensions_indent.mli.ref → test/passing/extensions-indent.mli.ref
diff --git a/test/passing/extensions_sugar_always.ml.opts → test/passing/extensions-sugar_always.ml.opts b/test/passing/extensions_sugar_always.ml.opts → test/passing/extensions-sugar_always.ml.opts
diff --git a/test/passing/extensions_sugar_always.ml.ref → test/passing/extensions-sugar_always.ml.ref b/test/passing/extensions_sugar_always.ml.ref → test/passing/extensions-sugar_always.ml.ref
diff --git a/test/passing/extensions_indent.ml b/test/passing/extensions_indent.ml
diff --git a/test/passing/extensions_indent.mli b/test/passing/extensions_indent.mli
diff --git a/test/passing/extensions_sugar_always.ml b/test/passing/extensions_sugar_always.ml
diff --git a/test/passing/field_op_begin_line.ml.opts → test/passing/field-op_begin_line.ml.opts b/test/passing/field_op_begin_line.ml.opts → test/passing/field-op_begin_line.ml.opts
diff --git a/test/passing/field_op_begin_line.ml.ref → test/passing/field-op_begin_line.ml.ref b/test/passing/field_op_begin_line.ml.ref → 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
diff --git a/test/passing/function_indent_never.ml.opts → test/passing/function_indent-never.ml.opts b/test/passing/function_indent_never.ml.opts → test/passing/function_indent-never.ml.opts
diff --git a/test/passing/function_indent_never.ml.ref → test/passing/function_indent-never.ml.ref b/test/passing/function_indent_never.ml.ref → test/passing/function_indent-never.ml.ref
diff --git a/test/passing/function_indent_always.ml → test/passing/function_indent.ml b/test/passing/function_indent_always.ml → test/passing/function_indent.ml
diff --git a/test/passing/function_indent_always.ml.opts → test/passing/function_indent.ml.opts b/test/passing/function_indent_always.ml.opts → test/passing/function_indent.ml.opts
diff --git a/test/passing/function_indent_always.ml.ref → test/passing/function_indent.ml.ref b/test/passing/function_indent_always.ml.ref → test/passing/function_indent.ml.ref
diff --git a/test/passing/function_indent_never.ml b/test/passing/function_indent_never.ml
diff --git a/test/passing/ite_fit_or_vertical.ml.opts → test/passing/ite-fit_or_vertical.ml.opts b/test/passing/ite_fit_or_vertical.ml.opts → test/passing/ite-fit_or_vertical.ml.opts
diff --git a/test/passing/ite_fit_or_vertical.ml.ref → test/passing/ite-fit_or_vertical.ml.ref b/test/passing/ite_fit_or_vertical.ml.ref → test/passing/ite-fit_or_vertical.ml.ref
diff --git a/...ssing/ite_fit_or_vertical_closing.ml.opts → ...ssing/ite-fit_or_vertical_closing.ml.opts b/...ssing/ite_fit_or_vertical_closing.ml.opts → ...ssing/ite-fit_or_vertical_closing.ml.opts
diff --git a/...assing/ite_fit_or_vertical_closing.ml.ref → ...assing/ite-fit_or_vertical_closing.ml.ref b/...assing/ite_fit_or_vertical_closing.ml.ref → ...assing/ite-fit_or_vertical_closing.ml.ref
diff --git a/...g/ite_fit_or_vertical_no_indicate.ml.opts → ...g/ite-fit_or_vertical_no_indicate.ml.opts b/...g/ite_fit_or_vertical_no_indicate.ml.opts → ...g/ite-fit_or_vertical_no_indicate.ml.opts
diff --git a/...ng/ite_fit_or_vertical_no_indicate.ml.ref → ...ng/ite-fit_or_vertical_no_indicate.ml.ref b/...ng/ite_fit_or_vertical_no_indicate.ml.ref → ...ng/ite-fit_or_vertical_no_indicate.ml.ref
diff --git a/test/passing/ite_kr.ml.opts → test/passing/ite-kr.ml.opts b/test/passing/ite_kr.ml.opts → test/passing/ite-kr.ml.opts
diff --git a/test/passing/ite_kr.ml.ref → test/passing/ite-kr.ml.ref b/test/passing/ite_kr.ml.ref → test/passing/ite-kr.ml.ref
diff --git a/test/passing/ite_kr_closing.ml.opts → test/passing/ite-kr_closing.ml.opts b/test/passing/ite_kr_closing.ml.opts → test/passing/ite-kr_closing.ml.opts
diff --git a/test/passing/ite_kr_closing.ml.ref → test/passing/ite-kr_closing.ml.ref b/test/passing/ite_kr_closing.ml.ref → test/passing/ite-kr_closing.ml.ref
diff --git a/test/passing/ite_kw_first.ml.opts → test/passing/ite-kw_first.ml.opts b/test/passing/ite_kw_first.ml.opts → test/passing/ite-kw_first.ml.opts
diff --git a/test/passing/ite_kw_first.ml.ref → test/passing/ite-kw_first.ml.ref b/test/passing/ite_kw_first.ml.ref → test/passing/ite-kw_first.ml.ref
diff --git a/test/passing/ite_kw_first_closing.ml.opts → test/passing/ite-kw_first_closing.ml.opts b/test/passing/ite_kw_first_closing.ml.opts → test/passing/ite-kw_first_closing.ml.opts
diff --git a/test/passing/ite_kw_first_closing.ml.ref → test/passing/ite-kw_first_closing.ml.ref b/test/passing/ite_kw_first_closing.ml.ref → test/passing/ite-kw_first_closing.ml.ref
diff --git a/.../passing/ite_kw_first_no_indicate.ml.opts → .../passing/ite-kw_first_no_indicate.ml.opts b/.../passing/ite_kw_first_no_indicate.ml.opts → .../passing/ite-kw_first_no_indicate.ml.opts
diff --git a/test/passing/ite_kw_first_no_indicate.ml.ref → test/passing/ite-kw_first_no_indicate.ml.ref b/test/passing/ite_kw_first_no_indicate.ml.ref → test/passing/ite-kw_first_no_indicate.ml.ref
diff --git a/test/passing/ite_no_indicate.ml.opts → test/passing/ite-no_indicate.ml.opts b/test/passing/ite_no_indicate.ml.opts → test/passing/ite-no_indicate.ml.opts
diff --git a/test/passing/ite_no_indicate.ml.ref → test/passing/ite-no_indicate.ml.ref b/test/passing/ite_no_indicate.ml.ref → 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
diff --git a/test/passing/ite_fit_or_vertical_closing.ml b/test/passing/ite_fit_or_vertical_closing.ml
diff --git a/test/passing/ite_fit_or_vertical_no_indicate.ml b/test/passing/ite_fit_or_vertical_no_indicate.ml
diff --git a/test/passing/ite_kr.ml b/test/passing/ite_kr.ml
diff --git a/test/passing/ite_kr_closing.ml b/test/passing/ite_kr_closing.ml
diff --git a/test/passing/ite_kw_first.ml b/test/passing/ite_kw_first.ml
diff --git a/test/passing/ite_kw_first_closing.ml b/test/passing/ite_kw_first_closing.ml
diff --git a/test/passing/ite_kw_first_no_indicate.ml b/test/passing/ite_kw_first_no_indicate.ml
diff --git a/test/passing/ite_no_indicate.ml b/test/passing/ite_no_indicate.ml
diff --git a/test/passing/let_binding_in_indent.ml.opts → test/passing/let_binding-in_indent.ml.opts b/test/passing/let_binding_in_indent.ml.opts → test/passing/let_binding-in_indent.ml.opts
diff --git a/test/passing/let_binding_in_indent.ml.ref → test/passing/let_binding-in_indent.ml.ref b/test/passing/let_binding_in_indent.ml.ref → test/passing/let_binding-in_indent.ml.ref
diff --git a/test/passing/let_binding_indent.ml.opts → test/passing/let_binding-indent.ml.opts b/test/passing/let_binding_indent.ml.opts → test/passing/let_binding-indent.ml.opts
diff --git a/test/passing/let_binding_indent.ml.ref → test/passing/let_binding-indent.ml.ref b/test/passing/let_binding_indent.ml.ref → 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
diff --git a/test/passing/let_binding_indent.ml b/test/passing/let_binding_indent.ml
diff --git a/test/passing/let_module_sparse.ml.opts → test/passing/let_module-sparse.ml.opts b/test/passing/let_module_sparse.ml.opts → test/passing/let_module-sparse.ml.opts
diff --git a/test/passing/let_module_sparse.ml.ref → test/passing/let_module-sparse.ml.ref b/test/passing/let_module_sparse.ml.ref → test/passing/let_module-sparse.ml.ref
diff --git a/test/passing/let_module_compact.ml → test/passing/let_module.ml b/test/passing/let_module_compact.ml → test/passing/let_module.ml
diff --git a/test/passing/let_module_compact.ml.opts → test/passing/let_module.ml.opts b/test/passing/let_module_compact.ml.opts → test/passing/let_module.ml.opts
diff --git a/test/passing/let_module_compact.ml.ref → test/passing/let_module.ml.ref b/test/passing/let_module_compact.ml.ref → test/passing/let_module.ml.ref
diff --git a/test/passing/let_module_sparse.ml b/test/passing/let_module_sparse.ml
diff --git a/test/passing/list-space_around.ml b/test/passing/list-space_around.ml
diff --git a/test/passing/match_indent_never.ml.opts → test/passing/match_indent-never.ml.opts b/test/passing/match_indent_never.ml.opts → test/passing/match_indent-never.ml.opts
diff --git a/test/passing/match_indent_never.ml.ref → test/passing/match_indent-never.ml.ref b/test/passing/match_indent_never.ml.ref → test/passing/match_indent-never.ml.ref
diff --git a/test/passing/match_indent_always.ml → test/passing/match_indent.ml b/test/passing/match_indent_always.ml → test/passing/match_indent.ml
diff --git a/test/passing/match_indent_always.ml.opts → test/passing/match_indent.ml.opts b/test/passing/match_indent_always.ml.opts → test/passing/match_indent.ml.opts
diff --git a/test/passing/match_indent_always.ml.ref → test/passing/match_indent.ml.ref b/test/passing/match_indent_always.ml.ref → test/passing/match_indent.ml.ref
diff --git a/test/passing/match_indent_never.ml b/test/passing/match_indent_never.ml
diff --git a/...sing/module_item_spacing_preserve.ml.opts → ...sing/module_item_spacing-preserve.ml.opts b/...sing/module_item_spacing_preserve.ml.opts → ...sing/module_item_spacing-preserve.ml.opts
diff --git a/...ssing/module_item_spacing_preserve.ml.ref → ...ssing/module_item_spacing-preserve.ml.ref b/...ssing/module_item_spacing_preserve.ml.ref → ...ssing/module_item_spacing-preserve.ml.ref
diff --git a/...assing/module_item_spacing_sparse.ml.opts → ...assing/module_item_spacing-sparse.ml.opts b/...assing/module_item_spacing_sparse.ml.opts → ...assing/module_item_spacing-sparse.ml.opts
diff --git a/...passing/module_item_spacing_sparse.ml.ref → ...passing/module_item_spacing-sparse.ml.ref b/...passing/module_item_spacing_sparse.ml.ref → ...passing/module_item_spacing-sparse.ml.ref
diff --git a/test/passing/module_item_spacing_compact.ml → test/passing/module_item_spacing.ml b/test/passing/module_item_spacing_compact.ml → test/passing/module_item_spacing.ml
diff --git a/...ssing/module_item_spacing_compact.ml.opts → test/passing/module_item_spacing.ml.opts b/...ssing/module_item_spacing_compact.ml.opts → test/passing/module_item_spacing.ml.opts
diff --git a/...assing/module_item_spacing_compact.ml.ref → test/passing/module_item_spacing.ml.ref b/...assing/module_item_spacing_compact.ml.ref → 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
diff --git a/test/passing/module_item_spacing_sparse.ml b/test/passing/module_item_spacing_sparse.ml
diff --git a/test/passing/open_auto.ml.opts → test/passing/open-auto.ml.opts b/test/passing/open_auto.ml.opts → test/passing/open-auto.ml.opts
diff --git a/test/passing/open_auto.ml.ref → test/passing/open-auto.ml.ref b/test/passing/open_auto.ml.ref → test/passing/open-auto.ml.ref
diff --git a/test/passing/open_long.ml.opts → test/passing/open-long.ml.opts b/test/passing/open_long.ml.opts → test/passing/open-long.ml.opts
diff --git a/test/passing/open_long.ml.ref → test/passing/open-long.ml.ref b/test/passing/open_long.ml.ref → test/passing/open-long.ml.ref
diff --git a/test/passing/open_preserve.ml.opts → test/passing/open-preserve.ml.opts b/test/passing/open_preserve.ml.opts → test/passing/open-preserve.ml.opts
diff --git a/test/passing/open_preserve.ml.ref → test/passing/open-preserve.ml.ref b/test/passing/open_preserve.ml.ref → test/passing/open-preserve.ml.ref
diff --git a/test/passing/open_short.ml.opts → test/passing/open-short.ml.opts b/test/passing/open_short.ml.opts → test/passing/open-short.ml.opts
diff --git a/test/passing/open_short.ml.ref → test/passing/open-short.ml.ref b/test/passing/open_short.ml.ref → test/passing/open-short.ml.ref
diff --git a/test/passing/open_auto.ml b/test/passing/open_auto.ml
diff --git a/test/passing/open_long.ml b/test/passing/open_long.ml
diff --git a/test/passing/open_preserve.ml b/test/passing/open_preserve.ml
diff --git a/test/passing/open_short.ml b/test/passing/open_short.ml
diff --git a/test/passing/record_loose.ml.opts → test/passing/record-loose.ml.opts b/test/passing/record_loose.ml.opts → test/passing/record-loose.ml.opts
diff --git a/test/passing/record_loose.ml.ref → test/passing/record-loose.ml.ref b/test/passing/record_loose.ml.ref → test/passing/record-loose.ml.ref
diff --git a/test/passing/record_tight_decl.ml.opts → test/passing/record-tight_decl.ml.opts b/test/passing/record_tight_decl.ml.opts → test/passing/record-tight_decl.ml.opts
diff --git a/test/passing/record_tight_decl.ml.ref → test/passing/record-tight_decl.ml.ref b/test/passing/record_tight_decl.ml.ref → test/passing/record-tight_decl.ml.ref
diff --git a/test/passing/record_loose.ml b/test/passing/record_loose.ml
diff --git a/test/passing/record_tight_decl.ml b/test/passing/record_tight_decl.ml
diff --git a/test/passing/sequence_preserve.ml.opts → test/passing/sequence-preserve.ml.opts b/test/passing/sequence_preserve.ml.opts → test/passing/sequence-preserve.ml.opts
diff --git a/test/passing/sequence_preserve.ml.ref → test/passing/sequence-preserve.ml.ref b/test/passing/sequence_preserve.ml.ref → test/passing/sequence-preserve.ml.ref
diff --git a/test/passing/sequence_preserve.ml b/test/passing/sequence_preserve.ml
diff --git a/test/passing/types-compact-space_around-docked.ml b/test/passing/types-compact-space_around-docked.ml
diff --git a/test/passing/types-compact-space_around.ml b/test/passing/types-compact-space_around.ml
diff --git a/test/passing/types-compact.ml b/test/passing/types-compact.ml
diff --git a/test/passing/types_indent.ml.opts → test/passing/types-indent.ml.opts b/test/passing/types_indent.ml.opts → test/passing/types-indent.ml.opts
diff --git a/test/passing/types_indent.ml.ref → test/passing/types-indent.ml.ref b/test/passing/types_indent.ml.ref → test/passing/types-indent.ml.ref
diff --git a/test/passing/types-sparse-space_around.ml b/test/passing/types-sparse-space_around.ml
diff --git a/test/passing/types-sparse.ml b/test/passing/types-sparse.ml
diff --git a/test/passing/types_indent.ml b/test/passing/types_indent.ml