Some tweaks before release (#1121)

* Update CHANGES.md * Add .ocamlformat dep in test/cli and test/failing * Add .ocamlformat to disabled test
ocaml-ppx · Nov 4, 2019 · 80709d9 · 80709d9
1 parent b3d2ce1
commit 80709d9
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,4 @@
-### (master)
+### 0.12 (2019-11-04)
 
 #### Changes
 

diff --git a/test/cli/.ocamlformat b/test/cli/.ocamlformat
@@ -0,0 +1,6 @@
+profile = ocamlformat
+break-cases = fit
+margin = 77
+parse-docstrings = true
+wrap-comments = true
+max-iters = 2
diff --git a/test/cli/dune.inc b/test/cli/dune.inc
@@ -1,6 +1,7 @@
 
 (rule
  (targets err_default_several_file.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "! %{bin:ocamlformat} %{read-lines:err_default_several_file.opts}"))))
@@ -11,6 +12,7 @@
 
 (rule
  (targets err_inplace_and_check.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "! %{bin:ocamlformat} %{read-lines:err_inplace_and_check.opts}"))))
@@ -21,6 +23,7 @@
 
 (rule
  (targets err_inplace_and_output.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "! %{bin:ocamlformat} %{read-lines:err_inplace_and_output.opts}"))))
@@ -31,6 +34,7 @@
 
 (rule
  (targets err_no_arg.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "! %{bin:ocamlformat} %{read-lines:err_no_arg.opts}"))))
@@ -41,6 +45,7 @@
 
 (rule
  (targets err_output_and_check.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "! %{bin:ocamlformat} %{read-lines:err_output_and_check.opts}"))))
@@ -51,6 +56,7 @@
 
 (rule
  (targets err_output_several_files.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "! %{bin:ocamlformat} %{read-lines:err_output_several_files.opts}"))))
@@ -61,6 +67,7 @@
 
 (rule
  (targets err_stdin_and_file.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "! %{bin:ocamlformat} %{read-lines:err_stdin_and_file.opts}"))))
@@ -71,6 +78,7 @@
 
 (rule
  (targets err_stdin_and_inplace.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "! %{bin:ocamlformat} %{read-lines:err_stdin_and_inplace.opts}"))))
@@ -81,6 +89,7 @@
 
 (rule
  (targets err_stdin_name_unknown_ext.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "! %{bin:ocamlformat} %{read-lines:err_stdin_name_unknown_ext.opts} < err_stdin_name_unknown_ext.stdin"))))
@@ -91,6 +100,7 @@
 
 (rule
  (targets err_stdin_no_kind.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "! %{bin:ocamlformat} %{read-lines:err_stdin_no_kind.opts}"))))
@@ -101,6 +111,7 @@
 
 (rule
  (targets name_unknown_ext.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "%{bin:ocamlformat} %{read-lines:name_unknown_ext.opts}"))))
@@ -111,6 +122,7 @@
 
 (rule
  (targets stdin_and_impl.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "%{bin:ocamlformat} %{read-lines:stdin_and_impl.opts} < stdin_and_impl.stdin"))))
@@ -121,6 +133,7 @@
 
 (rule
  (targets stdin_and_intf.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "%{bin:ocamlformat} %{read-lines:stdin_and_intf.opts} < stdin_and_intf.stdin"))))
@@ -131,6 +144,7 @@
 
 (rule
  (targets stdin_and_name.output)
+ (deps .ocamlformat)
  (action
   (with-outputs-to %{targets}
    (system "%{bin:ocamlformat} %{read-lines:stdin_and_name.opts} < stdin_and_name.stdin"))))

diff --git a/test/cli/gen/gen.ml b/test/cli/gen/gen.ml
@@ -51,6 +51,7 @@ let emit_test test_name entry =
   Format.printf {|
 (rule@
  (targets %s.output)@
+ (deps .ocamlformat)@
  (action@
   @[%a@]))@
 |} test_name run_action ();

diff --git a/test/disabled/dir1/.ocamlformat b/test/disabled/dir1/.ocamlformat
@@ -0,0 +1,6 @@
+profile = ocamlformat
+break-cases = fit
+margin = 77
+parse-docstrings = true
+wrap-comments = true
+max-iters = 2
diff --git a/test/failing/.ocamlformat b/test/failing/.ocamlformat
@@ -0,0 +1,6 @@
+profile = ocamlformat
+break-cases = fit
+margin = 77
+parse-docstrings = true
+wrap-comments = true
+max-iters = 2
diff --git a/test/failing/dune b/test/failing/dune
@@ -1,5 +1,6 @@
 (rule
  (targets list_and_comments.ml.output)
+ (deps .ocamlformat)
  (action
    (with-outputs-to %{targets}
      (run %{bin:ocamlformat} %{dep:list_and_comments.ml}))))