Simplify stdlib test

Signed-off-by: Jeremie Dimino <[email protected]>
ocaml · Jan 16, 2020 · 44c433f · 44c433f
1 parent 54dea32
commit 44c433f
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 52 deletions.
diff --git a/...mpilation/with-lib-interface/dune-project → ...est-cases/stdlib-compilation/dune-project b/...mpilation/with-lib-interface/dune-project → ...est-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
@@ -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/...interface/src/camlinternalFormatBasics.ml → ...mpilation/src/camlinternalFormatBasics.ml b/...interface/src/camlinternalFormatBasics.ml → ...mpilation/src/camlinternalFormatBasics.ml
diff --git a/...b-compilation/with-lib-interface/src/dune → ...ts/test-cases/stdlib-compilation/src/dune b/...b-compilation/with-lib-interface/src/dune → ...ts/test-cases/stdlib-compilation/src/dune
diff --git a/...ompilation/with-lib-interface/src/list.ml → ...test-cases/stdlib-compilation/src/list.ml b/...ompilation/with-lib-interface/src/list.ml → ...test-cases/stdlib-compilation/src/list.ml
diff --git a/...lation/with-lib-interface/src/std_exit.ml → ...-cases/stdlib-compilation/src/std_exit.ml b/...lation/with-lib-interface/src/std_exit.ml → ...-cases/stdlib-compilation/src/std_exit.ml
diff --git a/...pilation/with-lib-interface/src/stdlib.ml → ...st-cases/stdlib-compilation/src/stdlib.ml b/...pilation/with-lib-interface/src/stdlib.ml → ...st-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
diff --git a/...tests/test-cases/stdlib-compilation/without-lib-interface/src/camlinternalFormatBasics.ml b/...tests/test-cases/stdlib-compilation/without-lib-interface/src/camlinternalFormatBasics.ml
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
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
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