From b27486b4bdef0c3a4ec2a3f361569acd98f95b16 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Tue, 20 Feb 2018 10:37:08 +0700
Subject: [PATCH] Multi stanza in 1 jbuild build failure

After the change to run ocamldep per module, defining an executable and a
library this way doesn't work anymore.
---
 test/blackbox-tests/jbuild                             | 10 ++++++++++
 .../test-cases/ocamldep-multi-stanzas/jbuild           |  9 +++++++++
 .../test-cases/ocamldep-multi-stanzas/lib.ml           |  1 +
 .../test-cases/ocamldep-multi-stanzas/run.t            |  5 +++++
 .../test-cases/ocamldep-multi-stanzas/test.ml          |  1 +
 5 files changed, 26 insertions(+)
 create mode 100644 test/blackbox-tests/test-cases/ocamldep-multi-stanzas/jbuild
 create mode 100644 test/blackbox-tests/test-cases/ocamldep-multi-stanzas/lib.ml
 create mode 100644 test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t
 create mode 100644 test/blackbox-tests/test-cases/ocamldep-multi-stanzas/test.ml

diff --git a/test/blackbox-tests/jbuild b/test/blackbox-tests/jbuild
index 8aa5fe21..e2ec9dac 100644
--- a/test/blackbox-tests/jbuild
+++ b/test/blackbox-tests/jbuild
@@ -348,3 +348,13 @@
      (progn
       (run ${exe:cram.exe} -ocamlv ${ocaml_version} -skip-versions 4.02.3 run.t)
       (diff? run.t run.t.corrected)))))))
+
+(alias
+ ((name runtest)
+  (deps ((files_recursively_in test-cases/ocamldep-multi-stanzas)))
+  (action
+   (chdir test-cases/ocamldep-multi-stanzas
+    (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/ocamldep-multi-stanzas/jbuild b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/jbuild
new file mode 100644
index 00000000..d6e6d323
--- /dev/null
+++ b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/jbuild
@@ -0,0 +1,9 @@
+(jbuild_version 1)
+
+(library
+ ((name lib)
+  (modules (:standard \ test))))
+
+(executable
+ ((name test)
+  (libraries (lib))))
diff --git a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/lib.ml b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/lib.ml
new file mode 100644
index 00000000..ccd9b7a1
--- /dev/null
+++ b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/lib.ml
@@ -0,0 +1 @@
+let run () = print_endline "foo bar"
diff --git a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t
new file mode 100644
index 00000000..b6a3ffdb
--- /dev/null
+++ b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t
@@ -0,0 +1,5 @@
+  $ $JBUILDER exec ./test.exe -j1 --debug-dep --display short --root .
+  Multiple rules generated for _build/default/lib.o:
+  - <internal location>
+  - <internal location>
+  [1]
diff --git a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/test.ml b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/test.ml
new file mode 100644
index 00000000..058934e5
--- /dev/null
+++ b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/test.ml
@@ -0,0 +1 @@
+Lib.run ();;