From 44c433f97e54ef497581abbff55dda8f4503bc20 Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Wed, 15 Jan 2020 16:31:12 +0000 Subject: [PATCH] Simplify stdlib test Signed-off-by: Jeremie Dimino --- .../{with-lib-interface => }/dune-project | 0 .../test-cases/stdlib-compilation/run.t | 42 ++----------------- .../src/camlinternalFormatBasics.ml | 0 .../{with-lib-interface => }/src/dune | 0 .../{with-lib-interface => }/src/list.ml | 0 .../{with-lib-interface => }/src/std_exit.ml | 0 .../{with-lib-interface => }/src/stdlib.ml | 0 .../without-lib-interface/dune-project | 4 -- .../src/camlinternalFormatBasics.ml | 1 - .../without-lib-interface/src/dune | 7 ---- .../without-lib-interface/src/list.ml | 0 .../without-lib-interface/src/std_exit.ml | 1 - 12 files changed, 3 insertions(+), 52 deletions(-) rename test/blackbox-tests/test-cases/stdlib-compilation/{with-lib-interface => }/dune-project (100%) rename test/blackbox-tests/test-cases/stdlib-compilation/{with-lib-interface => }/src/camlinternalFormatBasics.ml (100%) rename test/blackbox-tests/test-cases/stdlib-compilation/{with-lib-interface => }/src/dune (100%) rename test/blackbox-tests/test-cases/stdlib-compilation/{with-lib-interface => }/src/list.ml (100%) rename test/blackbox-tests/test-cases/stdlib-compilation/{with-lib-interface => }/src/std_exit.ml (100%) rename test/blackbox-tests/test-cases/stdlib-compilation/{with-lib-interface => }/src/stdlib.ml (100%) delete mode 100644 test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/dune-project delete mode 100644 test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/camlinternalFormatBasics.ml delete mode 100644 test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/dune delete mode 100644 test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/list.ml delete mode 100644 test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/std_exit.ml diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/dune-project b/test/blackbox-tests/test-cases/stdlib-compilation/dune-project similarity index 100% rename from test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/dune-project rename to test/blackbox-tests/test-cases/stdlib-compilation/dune-project diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/run.t b/test/blackbox-tests/test-cases/stdlib-compilation/run.t index 4e1c5873dbb..c224515aab6 100644 --- a/test/blackbox-tests/test-cases/stdlib-compilation/run.t +++ b/test/blackbox-tests/test-cases/stdlib-compilation/run.t @@ -1,41 +1,5 @@ Build stdlib with stdlib.ml - $ dune build --display short @all --root with-lib-interface - Entering directory 'with-lib-interface' - cat src/camlinternalFormatBasics.pp.ml - ocamldep src/.stdlib.objs/camlinternalFormatBasics.pp.ml.d - ocamlc src/.stdlib.objs/byte/camlinternalFormatBasics.{cmi,cmo,cmt} - ocamlopt src/.stdlib.objs/native/camlinternalFormatBasics.{cmx,o} - cat src/list.pp.ml - ocamldep src/.stdlib.objs/list.pp.ml.d - cat src/std_exit.pp.ml - ocamldep src/.stdlib.objs/std_exit.pp.ml.d - cat src/stdlib.pp.ml - ocamldep src/.stdlib.objs/stdlib.pp.ml.d - ocamlc src/.stdlib.objs/byte/stdlib.{cmi,cmo,cmt} - ocamlc src/.stdlib.objs/byte/stdlib__List.{cmi,cmo,cmt} - ocamlc src/stdlib.cma - ocamlc src/.stdlib.objs/byte/std_exit.{cmi,cmo,cmt} - ocamlopt src/.stdlib.objs/native/std_exit.{cmx,o} - ocamlopt src/.stdlib.objs/native/stdlib.{cmx,o} - ocamlopt src/.stdlib.objs/native/stdlib__List.{cmx,o} - ocamlopt src/stdlib.{a,cmxa} - ocamlopt src/stdlib.cmxs -Build stdlib without stdlib.ml - $ dune build --display short @all --root without-lib-interface - Entering directory 'without-lib-interface' - cat src/camlinternalFormatBasics.pp.ml - ocamldep src/.stdlib.objs/camlinternalFormatBasics.pp.ml.d - ocamlc src/.stdlib.objs/byte/camlinternalFormatBasics.{cmi,cmo,cmt} - ocamlopt src/.stdlib.objs/native/camlinternalFormatBasics.{cmx,o} - cat src/list.pp.ml - ocamldep src/.stdlib.objs/list.pp.ml.d - ocamlc src/.stdlib.objs/byte/stdlib__List.{cmi,cmo,cmt} - ocamlopt src/.stdlib.objs/native/stdlib__List.{cmx,o} - cat src/std_exit.pp.ml - ocamldep src/.stdlib.objs/std_exit.pp.ml.d - ocamlopt src/stdlib.{a,cmxa} - ocamlopt src/stdlib.cmxs - ocamlc src/stdlib.cma - ocamlc src/.stdlib.objs/byte/std_exit.{cmi,cmo,cmt} - ocamlopt src/.stdlib.objs/native/std_exit.{cmx,o} + $ dune build @all + $ cd _build/default/src && ls *.cma + stdlib.cma diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/src/camlinternalFormatBasics.ml b/test/blackbox-tests/test-cases/stdlib-compilation/src/camlinternalFormatBasics.ml similarity index 100% rename from test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/src/camlinternalFormatBasics.ml rename to test/blackbox-tests/test-cases/stdlib-compilation/src/camlinternalFormatBasics.ml diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/src/dune b/test/blackbox-tests/test-cases/stdlib-compilation/src/dune similarity index 100% rename from test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/src/dune rename to test/blackbox-tests/test-cases/stdlib-compilation/src/dune diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/src/list.ml b/test/blackbox-tests/test-cases/stdlib-compilation/src/list.ml similarity index 100% rename from test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/src/list.ml rename to test/blackbox-tests/test-cases/stdlib-compilation/src/list.ml diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/src/std_exit.ml b/test/blackbox-tests/test-cases/stdlib-compilation/src/std_exit.ml similarity index 100% rename from test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/src/std_exit.ml rename to test/blackbox-tests/test-cases/stdlib-compilation/src/std_exit.ml diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/src/stdlib.ml b/test/blackbox-tests/test-cases/stdlib-compilation/src/stdlib.ml similarity index 100% rename from test/blackbox-tests/test-cases/stdlib-compilation/with-lib-interface/src/stdlib.ml rename to test/blackbox-tests/test-cases/stdlib-compilation/src/stdlib.ml diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/dune-project b/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/dune-project deleted file mode 100644 index 0fa1c764879..00000000000 --- a/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/dune-project +++ /dev/null @@ -1,4 +0,0 @@ -(lang dune 1.2) -(using experimental_building_ocaml_compiler_with_dune 0.1) - -(package (name stdlib)) diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/camlinternalFormatBasics.ml b/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/camlinternalFormatBasics.ml deleted file mode 100644 index ff1c52e9532..00000000000 --- a/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/camlinternalFormatBasics.ml +++ /dev/null @@ -1 +0,0 @@ -type fmt = Fmt diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/dune b/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/dune deleted file mode 100644 index 56acb3b7e31..00000000000 --- a/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/dune +++ /dev/null @@ -1,7 +0,0 @@ -(library - (public_name stdlib) - (stdlib - (modules_before_stdlib CamlinternalFormatBasics) - (exit_module std_exit) - (internal_modules Camlinternal*)) - (preprocess (action (run cat %{input-file})))) diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/list.ml b/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/list.ml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/std_exit.ml b/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/std_exit.ml deleted file mode 100644 index 0547b3d0eee..00000000000 --- a/test/blackbox-tests/test-cases/stdlib-compilation/without-lib-interface/src/std_exit.ml +++ /dev/null @@ -1 +0,0 @@ -let x = 1