From 620edbdd6a0234e1283b285b8b0100e9c187bfa2 Mon Sep 17 00:00:00 2001 From: Etienne Millon Date: Mon, 14 Nov 2022 15:50:13 +0100 Subject: [PATCH 1/2] test: disable formatting for a single dune file Signed-off-by: Etienne Millon --- .../test-cases/formatting-dune-disable.t | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 test/blackbox-tests/test-cases/formatting-dune-disable.t diff --git a/test/blackbox-tests/test-cases/formatting-dune-disable.t b/test/blackbox-tests/test-cases/formatting-dune-disable.t new file mode 100644 index 00000000000..604c8fab0b3 --- /dev/null +++ b/test/blackbox-tests/test-cases/formatting-dune-disable.t @@ -0,0 +1,27 @@ +This tests how it is possible to disable formatting for a particular dialect in +a given subdirectory. This can be used to disable formatting of a particular +dune file. + + $ cat > dune-project << EOF + > (lang dune 2.8) + > EOF + + $ cat > dune << EOF + > ; this file should be formatted + > (rule (write-file a b)) + > EOF + + $ mkdir sub + $ cat > sub/dune << EOF + > ; this file should not + > (env + > (_ + > (formatting (enabled_for ocaml)))) + > + > (rule (write-file a b)) + > EOF + + $ dune build @fmt + File "dune", line 1, characters 0-0: + Error: Files _build/default/dune and _build/default/.formatted/dune differ. + [1] From e3b9e84cc32f64f253b38b037002b26a90871268 Mon Sep 17 00:00:00 2001 From: Etienne Millon Date: Tue, 15 Nov 2022 16:53:49 +0100 Subject: [PATCH 2/2] Reorganize formatting tests Signed-off-by: Etienne Millon --- .../{formatting-dune-disable.t => formatting/disable-dune-file.t} | 0 .../{formatting.t => formatting/feature.t}/disabled/dune | 0 .../{formatting.t => formatting/feature.t}/disabled/dune-project | 0 .../{formatting.t => formatting/feature.t}/disabled/lib.ml | 0 .../{formatting.t => formatting/feature.t}/disabled/lib.mli | 0 .../feature.t}/enabled/dune-ocaml-syntax/dune | 0 .../{formatting.t => formatting/feature.t}/enabled/dune-project | 0 .../feature.t}/enabled/no-source-code/README.md | 0 .../feature.t}/enabled/ocaml_file.ml.orig | 0 .../{formatting.t => formatting/feature.t}/enabled/ocaml_file.mli | 0 .../feature.t}/enabled/other-project/a.ml | 0 .../feature.t}/enabled/other-project/dune | 0 .../feature.t}/enabled/other-project/dune-project | 0 .../feature.t}/enabled/reason_file.rei | 0 .../{formatting.t => formatting/feature.t}/enabled/subdir/dune | 0 .../{formatting.t => formatting/feature.t}/enabled/subdir/lib.ml | 0 .../{formatting.t => formatting/feature.t}/fake-tools/dune | 0 .../feature.t}/fake-tools/dune-project | 0 .../feature.t}/fake-tools/faketools.opam | 0 .../feature.t}/fake-tools/ocamlformat.ml | 0 .../{formatting.t => formatting/feature.t}/fake-tools/refmt.ml | 0 .../{formatting.t => formatting/feature.t}/fmt-cmd/dune-project | 0 .../{formatting.t => formatting/feature.t}/lang2/default/dune | 0 .../{formatting.t => formatting/feature.t}/lang2/default/e.ml | 0 .../{formatting.t => formatting/feature.t}/lang2/disabled/dune | 0 .../feature.t}/lang2/disabled/dune-project | 0 .../{formatting.t => formatting/feature.t}/lang2/disabled/e.ml | 0 .../{formatting.t => formatting/feature.t}/lang2/partial/a.ml | 0 .../{formatting.t => formatting/feature.t}/lang2/partial/b.re | 0 .../{formatting.t => formatting/feature.t}/lang2/partial/dune | 0 .../{formatting.t => formatting/feature.t}/partial/a.ml | 0 .../{formatting.t => formatting/feature.t}/partial/b.re | 0 .../{formatting.t => formatting/feature.t}/partial/dune | 0 .../{formatting.t => formatting/feature.t}/partial/dune-project | 0 .../test-cases/{formatting.t => formatting/feature.t}/run.t | 0 35 files changed, 0 insertions(+), 0 deletions(-) rename test/blackbox-tests/test-cases/{formatting-dune-disable.t => formatting/disable-dune-file.t} (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/disabled/dune (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/disabled/dune-project (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/disabled/lib.ml (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/disabled/lib.mli (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/enabled/dune-ocaml-syntax/dune (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/enabled/dune-project (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/enabled/no-source-code/README.md (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/enabled/ocaml_file.ml.orig (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/enabled/ocaml_file.mli (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/enabled/other-project/a.ml (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/enabled/other-project/dune (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/enabled/other-project/dune-project (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/enabled/reason_file.rei (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/enabled/subdir/dune (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/enabled/subdir/lib.ml (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/fake-tools/dune (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/fake-tools/dune-project (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/fake-tools/faketools.opam (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/fake-tools/ocamlformat.ml (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/fake-tools/refmt.ml (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/fmt-cmd/dune-project (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/lang2/default/dune (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/lang2/default/e.ml (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/lang2/disabled/dune (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/lang2/disabled/dune-project (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/lang2/disabled/e.ml (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/lang2/partial/a.ml (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/lang2/partial/b.re (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/lang2/partial/dune (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/partial/a.ml (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/partial/b.re (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/partial/dune (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/partial/dune-project (100%) rename test/blackbox-tests/test-cases/{formatting.t => formatting/feature.t}/run.t (100%) diff --git a/test/blackbox-tests/test-cases/formatting-dune-disable.t b/test/blackbox-tests/test-cases/formatting/disable-dune-file.t similarity index 100% rename from test/blackbox-tests/test-cases/formatting-dune-disable.t rename to test/blackbox-tests/test-cases/formatting/disable-dune-file.t diff --git a/test/blackbox-tests/test-cases/formatting.t/disabled/dune b/test/blackbox-tests/test-cases/formatting/feature.t/disabled/dune similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/disabled/dune rename to test/blackbox-tests/test-cases/formatting/feature.t/disabled/dune diff --git a/test/blackbox-tests/test-cases/formatting.t/disabled/dune-project b/test/blackbox-tests/test-cases/formatting/feature.t/disabled/dune-project similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/disabled/dune-project rename to test/blackbox-tests/test-cases/formatting/feature.t/disabled/dune-project diff --git a/test/blackbox-tests/test-cases/formatting.t/disabled/lib.ml b/test/blackbox-tests/test-cases/formatting/feature.t/disabled/lib.ml similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/disabled/lib.ml rename to test/blackbox-tests/test-cases/formatting/feature.t/disabled/lib.ml diff --git a/test/blackbox-tests/test-cases/formatting.t/disabled/lib.mli b/test/blackbox-tests/test-cases/formatting/feature.t/disabled/lib.mli similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/disabled/lib.mli rename to test/blackbox-tests/test-cases/formatting/feature.t/disabled/lib.mli diff --git a/test/blackbox-tests/test-cases/formatting.t/enabled/dune-ocaml-syntax/dune b/test/blackbox-tests/test-cases/formatting/feature.t/enabled/dune-ocaml-syntax/dune similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/enabled/dune-ocaml-syntax/dune rename to test/blackbox-tests/test-cases/formatting/feature.t/enabled/dune-ocaml-syntax/dune diff --git a/test/blackbox-tests/test-cases/formatting.t/enabled/dune-project b/test/blackbox-tests/test-cases/formatting/feature.t/enabled/dune-project similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/enabled/dune-project rename to test/blackbox-tests/test-cases/formatting/feature.t/enabled/dune-project diff --git a/test/blackbox-tests/test-cases/formatting.t/enabled/no-source-code/README.md b/test/blackbox-tests/test-cases/formatting/feature.t/enabled/no-source-code/README.md similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/enabled/no-source-code/README.md rename to test/blackbox-tests/test-cases/formatting/feature.t/enabled/no-source-code/README.md diff --git a/test/blackbox-tests/test-cases/formatting.t/enabled/ocaml_file.ml.orig b/test/blackbox-tests/test-cases/formatting/feature.t/enabled/ocaml_file.ml.orig similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/enabled/ocaml_file.ml.orig rename to test/blackbox-tests/test-cases/formatting/feature.t/enabled/ocaml_file.ml.orig diff --git a/test/blackbox-tests/test-cases/formatting.t/enabled/ocaml_file.mli b/test/blackbox-tests/test-cases/formatting/feature.t/enabled/ocaml_file.mli similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/enabled/ocaml_file.mli rename to test/blackbox-tests/test-cases/formatting/feature.t/enabled/ocaml_file.mli diff --git a/test/blackbox-tests/test-cases/formatting.t/enabled/other-project/a.ml b/test/blackbox-tests/test-cases/formatting/feature.t/enabled/other-project/a.ml similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/enabled/other-project/a.ml rename to test/blackbox-tests/test-cases/formatting/feature.t/enabled/other-project/a.ml diff --git a/test/blackbox-tests/test-cases/formatting.t/enabled/other-project/dune b/test/blackbox-tests/test-cases/formatting/feature.t/enabled/other-project/dune similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/enabled/other-project/dune rename to test/blackbox-tests/test-cases/formatting/feature.t/enabled/other-project/dune diff --git a/test/blackbox-tests/test-cases/formatting.t/enabled/other-project/dune-project b/test/blackbox-tests/test-cases/formatting/feature.t/enabled/other-project/dune-project similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/enabled/other-project/dune-project rename to test/blackbox-tests/test-cases/formatting/feature.t/enabled/other-project/dune-project diff --git a/test/blackbox-tests/test-cases/formatting.t/enabled/reason_file.rei b/test/blackbox-tests/test-cases/formatting/feature.t/enabled/reason_file.rei similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/enabled/reason_file.rei rename to test/blackbox-tests/test-cases/formatting/feature.t/enabled/reason_file.rei diff --git a/test/blackbox-tests/test-cases/formatting.t/enabled/subdir/dune b/test/blackbox-tests/test-cases/formatting/feature.t/enabled/subdir/dune similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/enabled/subdir/dune rename to test/blackbox-tests/test-cases/formatting/feature.t/enabled/subdir/dune diff --git a/test/blackbox-tests/test-cases/formatting.t/enabled/subdir/lib.ml b/test/blackbox-tests/test-cases/formatting/feature.t/enabled/subdir/lib.ml similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/enabled/subdir/lib.ml rename to test/blackbox-tests/test-cases/formatting/feature.t/enabled/subdir/lib.ml diff --git a/test/blackbox-tests/test-cases/formatting.t/fake-tools/dune b/test/blackbox-tests/test-cases/formatting/feature.t/fake-tools/dune similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/fake-tools/dune rename to test/blackbox-tests/test-cases/formatting/feature.t/fake-tools/dune diff --git a/test/blackbox-tests/test-cases/formatting.t/fake-tools/dune-project b/test/blackbox-tests/test-cases/formatting/feature.t/fake-tools/dune-project similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/fake-tools/dune-project rename to test/blackbox-tests/test-cases/formatting/feature.t/fake-tools/dune-project diff --git a/test/blackbox-tests/test-cases/formatting.t/fake-tools/faketools.opam b/test/blackbox-tests/test-cases/formatting/feature.t/fake-tools/faketools.opam similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/fake-tools/faketools.opam rename to test/blackbox-tests/test-cases/formatting/feature.t/fake-tools/faketools.opam diff --git a/test/blackbox-tests/test-cases/formatting.t/fake-tools/ocamlformat.ml b/test/blackbox-tests/test-cases/formatting/feature.t/fake-tools/ocamlformat.ml similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/fake-tools/ocamlformat.ml rename to test/blackbox-tests/test-cases/formatting/feature.t/fake-tools/ocamlformat.ml diff --git a/test/blackbox-tests/test-cases/formatting.t/fake-tools/refmt.ml b/test/blackbox-tests/test-cases/formatting/feature.t/fake-tools/refmt.ml similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/fake-tools/refmt.ml rename to test/blackbox-tests/test-cases/formatting/feature.t/fake-tools/refmt.ml diff --git a/test/blackbox-tests/test-cases/formatting.t/fmt-cmd/dune-project b/test/blackbox-tests/test-cases/formatting/feature.t/fmt-cmd/dune-project similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/fmt-cmd/dune-project rename to test/blackbox-tests/test-cases/formatting/feature.t/fmt-cmd/dune-project diff --git a/test/blackbox-tests/test-cases/formatting.t/lang2/default/dune b/test/blackbox-tests/test-cases/formatting/feature.t/lang2/default/dune similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/lang2/default/dune rename to test/blackbox-tests/test-cases/formatting/feature.t/lang2/default/dune diff --git a/test/blackbox-tests/test-cases/formatting.t/lang2/default/e.ml b/test/blackbox-tests/test-cases/formatting/feature.t/lang2/default/e.ml similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/lang2/default/e.ml rename to test/blackbox-tests/test-cases/formatting/feature.t/lang2/default/e.ml diff --git a/test/blackbox-tests/test-cases/formatting.t/lang2/disabled/dune b/test/blackbox-tests/test-cases/formatting/feature.t/lang2/disabled/dune similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/lang2/disabled/dune rename to test/blackbox-tests/test-cases/formatting/feature.t/lang2/disabled/dune diff --git a/test/blackbox-tests/test-cases/formatting.t/lang2/disabled/dune-project b/test/blackbox-tests/test-cases/formatting/feature.t/lang2/disabled/dune-project similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/lang2/disabled/dune-project rename to test/blackbox-tests/test-cases/formatting/feature.t/lang2/disabled/dune-project diff --git a/test/blackbox-tests/test-cases/formatting.t/lang2/disabled/e.ml b/test/blackbox-tests/test-cases/formatting/feature.t/lang2/disabled/e.ml similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/lang2/disabled/e.ml rename to test/blackbox-tests/test-cases/formatting/feature.t/lang2/disabled/e.ml diff --git a/test/blackbox-tests/test-cases/formatting.t/lang2/partial/a.ml b/test/blackbox-tests/test-cases/formatting/feature.t/lang2/partial/a.ml similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/lang2/partial/a.ml rename to test/blackbox-tests/test-cases/formatting/feature.t/lang2/partial/a.ml diff --git a/test/blackbox-tests/test-cases/formatting.t/lang2/partial/b.re b/test/blackbox-tests/test-cases/formatting/feature.t/lang2/partial/b.re similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/lang2/partial/b.re rename to test/blackbox-tests/test-cases/formatting/feature.t/lang2/partial/b.re diff --git a/test/blackbox-tests/test-cases/formatting.t/lang2/partial/dune b/test/blackbox-tests/test-cases/formatting/feature.t/lang2/partial/dune similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/lang2/partial/dune rename to test/blackbox-tests/test-cases/formatting/feature.t/lang2/partial/dune diff --git a/test/blackbox-tests/test-cases/formatting.t/partial/a.ml b/test/blackbox-tests/test-cases/formatting/feature.t/partial/a.ml similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/partial/a.ml rename to test/blackbox-tests/test-cases/formatting/feature.t/partial/a.ml diff --git a/test/blackbox-tests/test-cases/formatting.t/partial/b.re b/test/blackbox-tests/test-cases/formatting/feature.t/partial/b.re similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/partial/b.re rename to test/blackbox-tests/test-cases/formatting/feature.t/partial/b.re diff --git a/test/blackbox-tests/test-cases/formatting.t/partial/dune b/test/blackbox-tests/test-cases/formatting/feature.t/partial/dune similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/partial/dune rename to test/blackbox-tests/test-cases/formatting/feature.t/partial/dune diff --git a/test/blackbox-tests/test-cases/formatting.t/partial/dune-project b/test/blackbox-tests/test-cases/formatting/feature.t/partial/dune-project similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/partial/dune-project rename to test/blackbox-tests/test-cases/formatting/feature.t/partial/dune-project diff --git a/test/blackbox-tests/test-cases/formatting.t/run.t b/test/blackbox-tests/test-cases/formatting/feature.t/run.t similarity index 100% rename from test/blackbox-tests/test-cases/formatting.t/run.t rename to test/blackbox-tests/test-cases/formatting/feature.t/run.t