Merge pull request #531 from rgrinberg/ocamldep-multi-stanza

Multi stanza in 1 jbuild build failure
ocaml · Feb 20, 2018 · 41693ae · 41693ae
2 parents eefe434 + b27486b
commit 41693ae
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1 @@
+Lib.run ();;