From 1e6ee05ecc51b0beef62ed6f0a3bfd5d79828575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Dimino?= Date: Tue, 13 Feb 2018 12:46:07 +0000 Subject: [PATCH] Added tests for byte-code only architectures (#509) --- test/blackbox-tests/jbuild | 11 +++++++++++ .../test-cases/byte-code-only/bin/jbuild | 3 +++ .../test-cases/byte-code-only/bin/toto.ml | 1 + .../blackbox-tests/test-cases/byte-code-only/foo.opam | 0 .../test-cases/byte-code-only/ocaml-bin/ocamlc | 3 +++ .../test-cases/byte-code-only/ocaml-bin/ocamldep | 3 +++ .../test-cases/byte-code-only/ocaml-bin/ocamlmklib | 3 +++ test/blackbox-tests/test-cases/byte-code-only/run.t | 9 +++++++++ .../test-cases/byte-code-only/src/foo.ml | 1 + .../test-cases/byte-code-only/src/jbuild | 3 +++ 10 files changed, 37 insertions(+) create mode 100644 test/blackbox-tests/test-cases/byte-code-only/bin/jbuild create mode 100644 test/blackbox-tests/test-cases/byte-code-only/bin/toto.ml create mode 100644 test/blackbox-tests/test-cases/byte-code-only/foo.opam create mode 100755 test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamlc create mode 100755 test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamldep create mode 100755 test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamlmklib create mode 100644 test/blackbox-tests/test-cases/byte-code-only/run.t create mode 100644 test/blackbox-tests/test-cases/byte-code-only/src/foo.ml create mode 100644 test/blackbox-tests/test-cases/byte-code-only/src/jbuild diff --git a/test/blackbox-tests/jbuild b/test/blackbox-tests/jbuild index 43cee20d..8e6e9772 100644 --- a/test/blackbox-tests/jbuild +++ b/test/blackbox-tests/jbuild @@ -307,3 +307,14 @@ (progn (run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))) + + +(alias + ((name runtest) + (deps ((files_recursively_in test-cases/byte-code-only))) + (action + (chdir test-cases/byte-code-only + (setenv JBUILDER ${bin:jbuilder} + (progn + (run ${exe:cram.exe} run.t) + (diff? run.t run.t.corrected))))))) diff --git a/test/blackbox-tests/test-cases/byte-code-only/bin/jbuild b/test/blackbox-tests/test-cases/byte-code-only/bin/jbuild new file mode 100644 index 00000000..f72bad17 --- /dev/null +++ b/test/blackbox-tests/test-cases/byte-code-only/bin/jbuild @@ -0,0 +1,3 @@ +(executable + ((name toto) + (public_name toto))) diff --git a/test/blackbox-tests/test-cases/byte-code-only/bin/toto.ml b/test/blackbox-tests/test-cases/byte-code-only/bin/toto.ml new file mode 100644 index 00000000..2ddf2486 --- /dev/null +++ b/test/blackbox-tests/test-cases/byte-code-only/bin/toto.ml @@ -0,0 +1 @@ +print_endline "Hello, world!" diff --git a/test/blackbox-tests/test-cases/byte-code-only/foo.opam b/test/blackbox-tests/test-cases/byte-code-only/foo.opam new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamlc b/test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamlc new file mode 100755 index 00000000..ba232f53 --- /dev/null +++ b/test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamlc @@ -0,0 +1,3 @@ +#!/bin/sh +export PATH="$ORIG_PATH" +exec ocamlc "$@" diff --git a/test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamldep b/test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamldep new file mode 100755 index 00000000..92243f2b --- /dev/null +++ b/test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamldep @@ -0,0 +1,3 @@ +#!/bin/sh +export PATH="$ORIG_PATH" +exec ocamldep "$@" diff --git a/test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamlmklib b/test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamlmklib new file mode 100755 index 00000000..b042310c --- /dev/null +++ b/test/blackbox-tests/test-cases/byte-code-only/ocaml-bin/ocamlmklib @@ -0,0 +1,3 @@ +#!/bin/sh +export PATH="$ORIG_PATH" +exec ocamlmklib "$@" diff --git a/test/blackbox-tests/test-cases/byte-code-only/run.t b/test/blackbox-tests/test-cases/byte-code-only/run.t new file mode 100644 index 00000000..cf2e41c0 --- /dev/null +++ b/test/blackbox-tests/test-cases/byte-code-only/run.t @@ -0,0 +1,9 @@ + $ env ORIG_PATH="$PATH" PATH="$PWD/ocaml-bin:$PATH" $JBUILDER build --root . -j1 --display short + No rule found for src/.foo.objs/foo.cmx + ocamldep bin/toto.ml.d + ocamldep src/foo.ml.d + ocamlc bin/.toto.eobjs/toto.{cmi,cmo,cmt} + ocamlc src/.foo.objs/foo.{cmi,cmo,cmt} + ocamlc bin/toto.exe + ocamlc src/foo.cma + [1] diff --git a/test/blackbox-tests/test-cases/byte-code-only/src/foo.ml b/test/blackbox-tests/test-cases/byte-code-only/src/foo.ml new file mode 100644 index 00000000..7fecab12 --- /dev/null +++ b/test/blackbox-tests/test-cases/byte-code-only/src/foo.ml @@ -0,0 +1 @@ +let x = 42 diff --git a/test/blackbox-tests/test-cases/byte-code-only/src/jbuild b/test/blackbox-tests/test-cases/byte-code-only/src/jbuild new file mode 100644 index 00000000..d13cdf92 --- /dev/null +++ b/test/blackbox-tests/test-cases/byte-code-only/src/jbuild @@ -0,0 +1,3 @@ +(library + ((name foo) + (public_name foo)))