From d6601bf2bb311f8a3076210bf5621119b079b7fc Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 24 Jan 2018 15:55:50 +0800 Subject: [PATCH] META generation bug in different scopes --- test/blackbox-tests/jbuild | 10 ++++++++++ test/blackbox-tests/test-cases/scope-bug/alib/alib.ml | 0 .../blackbox-tests/test-cases/scope-bug/alib/alib.opam | 0 test/blackbox-tests/test-cases/scope-bug/alib/jbuild | 6 ++++++ test/blackbox-tests/test-cases/scope-bug/alib/main.ml | 0 test/blackbox-tests/test-cases/scope-bug/blib/blib.ml | 0 .../blackbox-tests/test-cases/scope-bug/blib/blib.opam | 0 test/blackbox-tests/test-cases/scope-bug/blib/jbuild | 6 ++++++ .../test-cases/scope-bug/blib/sub/jbuild | 5 +++++ .../test-cases/scope-bug/blib/sub/sub.ml | 0 test/blackbox-tests/test-cases/scope-bug/run.t | 5 +++++ 11 files changed, 32 insertions(+) create mode 100644 test/blackbox-tests/test-cases/scope-bug/alib/alib.ml create mode 100644 test/blackbox-tests/test-cases/scope-bug/alib/alib.opam create mode 100644 test/blackbox-tests/test-cases/scope-bug/alib/jbuild create mode 100644 test/blackbox-tests/test-cases/scope-bug/alib/main.ml create mode 100644 test/blackbox-tests/test-cases/scope-bug/blib/blib.ml create mode 100644 test/blackbox-tests/test-cases/scope-bug/blib/blib.opam create mode 100644 test/blackbox-tests/test-cases/scope-bug/blib/jbuild create mode 100644 test/blackbox-tests/test-cases/scope-bug/blib/sub/jbuild create mode 100644 test/blackbox-tests/test-cases/scope-bug/blib/sub/sub.ml create mode 100644 test/blackbox-tests/test-cases/scope-bug/run.t diff --git a/test/blackbox-tests/jbuild b/test/blackbox-tests/jbuild index 869b4391..836da50c 100644 --- a/test/blackbox-tests/jbuild +++ b/test/blackbox-tests/jbuild @@ -257,3 +257,13 @@ (progn (run ${exe:cram.exe} run.t) (diff? run.t run.t.corrected))))))) + +(alias + ((name runtest) + (deps ((files_recursively_in test-cases/scope-bug))) + (action + (chdir test-cases/scope-bug + (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/scope-bug/alib/alib.ml b/test/blackbox-tests/test-cases/scope-bug/alib/alib.ml new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/scope-bug/alib/alib.opam b/test/blackbox-tests/test-cases/scope-bug/alib/alib.opam new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/scope-bug/alib/jbuild b/test/blackbox-tests/test-cases/scope-bug/alib/jbuild new file mode 100644 index 00000000..26d5ea18 --- /dev/null +++ b/test/blackbox-tests/test-cases/scope-bug/alib/jbuild @@ -0,0 +1,6 @@ +(jbuild_version 1) + +(library + ((name alib) + (public_name alib) + (libraries (blib)))) diff --git a/test/blackbox-tests/test-cases/scope-bug/alib/main.ml b/test/blackbox-tests/test-cases/scope-bug/alib/main.ml new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/scope-bug/blib/blib.ml b/test/blackbox-tests/test-cases/scope-bug/blib/blib.ml new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/scope-bug/blib/blib.opam b/test/blackbox-tests/test-cases/scope-bug/blib/blib.opam new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/scope-bug/blib/jbuild b/test/blackbox-tests/test-cases/scope-bug/blib/jbuild new file mode 100644 index 00000000..6d3639dc --- /dev/null +++ b/test/blackbox-tests/test-cases/scope-bug/blib/jbuild @@ -0,0 +1,6 @@ +(jbuild_version 1) + +(library + ((name blib) + (public_name blib) + (libraries (sub)))) diff --git a/test/blackbox-tests/test-cases/scope-bug/blib/sub/jbuild b/test/blackbox-tests/test-cases/scope-bug/blib/sub/jbuild new file mode 100644 index 00000000..5ab19ae4 --- /dev/null +++ b/test/blackbox-tests/test-cases/scope-bug/blib/sub/jbuild @@ -0,0 +1,5 @@ +(jbuild_version 1) + +(library + ((name sub) + (public_name blib.sub))) diff --git a/test/blackbox-tests/test-cases/scope-bug/blib/sub/sub.ml b/test/blackbox-tests/test-cases/scope-bug/blib/sub/sub.ml new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/scope-bug/run.t b/test/blackbox-tests/test-cases/scope-bug/run.t new file mode 100644 index 00000000..1c3f3e34 --- /dev/null +++ b/test/blackbox-tests/test-cases/scope-bug/run.t @@ -0,0 +1,5 @@ + $ $JBUILDER build -j1 --root . @install + Error: External library "sub" not found. + -> required by "alib/jbuild (context default)" + Hint: try: jbuilder external-lib-deps --missing --root . @install + [1]