Merge pull request ocaml#1626 from nojb/multi-dir-preprocess-action

Add test for using (include_subdirs unqualified) + (preprocess (action ...))

CHANGES.md

@@ -10,6 +10,9 @@ unreleased
 - Generate `dune-package` files for every package. These files are installed and
   read instead of `META` files whenever they are available (#1329, @rgrinberg)
 
+- Fix preprocessing for libraries with `(include_subdirs ..)` (#1624, fix #1626,
+  @nojb, @rgrinberg)
+
 1.6.2 (05/12/2018)
 ------------------
 

src/preprocessing.ml

@@ -665,7 +665,7 @@ let make sctx ~dir ~expander ~dep_kind ~lint ~preprocess
                   ~expander
                   ~dep_kind
                   ~targets:(Static [dst])
-                  ~targets_dir:dir))
+                  ~targets_dir:(Path.parent_exn dst)))
            |> setup_reason_rules sctx in
          if lint then lint_module ~ast ~source:m;
          ast)

test/blackbox-tests/test-cases/multi-dir/run.t

@@ -49,3 +49,21 @@ Test some error cases
   Error: This stanza is not allowed in a sub-directory of directory with (include_subdirs unqualified).
   Hint: add (include_subdirs no) to this file.
   [1]
+
+Test for (include_subdir unqualified) with (preprocess (action ...))
+--------------------------------------------------------------------
+
+  $ dune build --display short --root test4 @all
+  Entering directory 'test4'
+      ocamldep .main.eobjs/main.ml.d
+        ocamlc .main.eobjs/main.{cmi,cmo,cmt}
+      ocamlopt .main.eobjs/main.{cmx,o}
+      ocamlopt main.exe
+          main sub/foo.pp.ml
+      ocamldep .foo.objs/foo.pp.ml.d
+        ocamlc .foo.objs/foo.{cmi,cmo,cmt}
+      ocamlopt .foo.objs/foo.{cmx,o}
+      ocamlopt foo.{a,cmxa}
+      ocamlopt foo.cmxs
+        ocamlc main.bc
+        ocamlc foo.cma

test/blackbox-tests/test-cases/multi-dir/test4/dune

@@ -0,0 +1,10 @@
+(executable
+ (name main)
+ (modules main))
+
+(library
+ (name foo)
+ (preprocess (action (run ./main.exe %{input-file})))
+ (modules foo))
+
+(include_subdirs unqualified)

test/blackbox-tests/test-cases/multi-dir/test4/dune-project

@@ -0,0 +1 @@
+(lang dune 1.1)

test/blackbox-tests/test-cases/multi-dir/test4/main.ml

@@ -0,0 +1,2 @@
+let () =
+  print_endline "print_endline \"foo\""