From 224d627d070a6e584ae9622fe188ba3ed623538f Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Thu, 1 Mar 2018 23:05:32 +0000 Subject: [PATCH] Import the test case for #568 --- test/blackbox-tests/jbuild | 10 ++++++ .../test-cases/github568/jbuild | 35 +++++++++++++++++++ .../test-cases/github568/lib1.ml | 0 .../test-cases/github568/lib1.opam | 4 +++ .../test-cases/github568/lib2.ml | 0 .../test-cases/github568/lib2.opam | 4 +++ .../blackbox-tests/test-cases/github568/run.t | 12 +++++++ .../test-cases/github568/test1.ml | 0 .../test-cases/github568/test2.ml | 0 9 files changed, 65 insertions(+) create mode 100644 test/blackbox-tests/test-cases/github568/jbuild create mode 100644 test/blackbox-tests/test-cases/github568/lib1.ml create mode 100644 test/blackbox-tests/test-cases/github568/lib1.opam create mode 100644 test/blackbox-tests/test-cases/github568/lib2.ml create mode 100644 test/blackbox-tests/test-cases/github568/lib2.opam create mode 100644 test/blackbox-tests/test-cases/github568/run.t create mode 100644 test/blackbox-tests/test-cases/github568/test1.ml create mode 100644 test/blackbox-tests/test-cases/github568/test2.ml diff --git a/test/blackbox-tests/jbuild b/test/blackbox-tests/jbuild index bc13699b..5fda7ae6 100644 --- a/test/blackbox-tests/jbuild +++ b/test/blackbox-tests/jbuild @@ -388,3 +388,13 @@ (progn (run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))) + +(alias + ((name runtest) + (deps ((files_recursively_in test-cases/github568))) + (action + (chdir test-cases/github568 + (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/github568/jbuild b/test/blackbox-tests/test-cases/github568/jbuild new file mode 100644 index 00000000..508fc1dd --- /dev/null +++ b/test/blackbox-tests/test-cases/github568/jbuild @@ -0,0 +1,35 @@ +(jbuild_version 1) + + +(library + ((name lib1) + (public_name lib1) + (modules (Lib1)))) + +(alias + ((name runtest) + (package lib1) + (deps (test1.exe)) + (action (run ${<})))) + +(executable + ((name test1) + (modules (Test1)) + (libraries (lib1)))) + + +(library + ((name lib2) + (public_name lib2) + (modules (Lib2)))) + +(alias + ((name runtest) + (package lib2) + (deps (test2.exe)) + (action (run ${<})))) + +(executable + ((name test2) + (modules (Test2)) + (libraries (lib2)))) diff --git a/test/blackbox-tests/test-cases/github568/lib1.ml b/test/blackbox-tests/test-cases/github568/lib1.ml new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/github568/lib1.opam b/test/blackbox-tests/test-cases/github568/lib1.opam new file mode 100644 index 00000000..505d9257 --- /dev/null +++ b/test/blackbox-tests/test-cases/github568/lib1.opam @@ -0,0 +1,4 @@ +opam-version: "1.2" +name: "lib1" +build: [["jbuilder" "build" "-p" name "-j" jobs]] +build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]] diff --git a/test/blackbox-tests/test-cases/github568/lib2.ml b/test/blackbox-tests/test-cases/github568/lib2.ml new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/github568/lib2.opam b/test/blackbox-tests/test-cases/github568/lib2.opam new file mode 100644 index 00000000..b29dfc9c --- /dev/null +++ b/test/blackbox-tests/test-cases/github568/lib2.opam @@ -0,0 +1,4 @@ +opam-version: "1.2" +name: "lib2" +build: [["jbuilder" "build" "-p" name "-j" jobs]] +build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]] diff --git a/test/blackbox-tests/test-cases/github568/run.t b/test/blackbox-tests/test-cases/github568/run.t new file mode 100644 index 00000000..de5d6ff2 --- /dev/null +++ b/test/blackbox-tests/test-cases/github568/run.t @@ -0,0 +1,12 @@ + $ $JBUILDER runtest --display short -j1 -p lib1 --debug-dependency-path + File "jbuild", line 1, characters 0-464: + Error: Library "lib2" not found. + -> required by .merlin + -> required by .merlin-exists + -> required by test1.exe + -> required by alias runtest + -> required by alias runtest + Hint: try: jbuilder external-lib-deps --missing -p lib1 @runtest + ocamldep test1.ml.d + ocamldep lib1.ml.d + [1] diff --git a/test/blackbox-tests/test-cases/github568/test1.ml b/test/blackbox-tests/test-cases/github568/test1.ml new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/github568/test2.ml b/test/blackbox-tests/test-cases/github568/test2.ml new file mode 100644 index 00000000..e69de29b