Merge pull request #1243 from rgrinberg/fix-1240

Allow expect tests to generated in test stanza
ocaml · Sep 10, 2018 · fc7aaa1 · fc7aaa1
2 parents 4041db3 + 529a8e6
commit fc7aaa1
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 14 deletions.
diff --git a/src/gen_rules.ml b/src/gen_rules.ml
@@ -149,12 +149,11 @@ module Gen(P : Install_rules.Params) = struct
      | Tests                                                           |
      +-----------------------------------------------------------------+ *)
 
-  let tests_rules (t : Tests.t) ~dir ~scope ~dir_contents
-        ~dir_kind ~src_dir =
+  let tests_rules (t : Tests.t) ~dir ~scope ~dir_contents ~dir_kind =
     let test_kind (loc, name) =
-      let sources = SC.source_files sctx ~src_path:src_dir in
+      let files = Dir_contents.text_files dir_contents in
       let expected_basename = name ^ ".expected" in
-      if String.Set.mem sources expected_basename then
+      if String.Set.mem files expected_basename then
         `Expect
           { Action.Unexpanded.Diff.
             file1 = String_with_vars.make_text loc expected_basename
@@ -244,8 +243,7 @@ module Gen(P : Install_rules.Params) = struct
             loop stanzas merlins cctxs
           | Tests tests ->
             let cctx, merlin =
-              tests_rules tests ~dir ~scope ~src_dir
-                ~dir_contents ~dir_kind:kind
+              tests_rules tests ~dir ~scope ~dir_contents ~dir_kind:kind
             in
             loop stanzas (merlin :: merlins)
               ((tests.exes.buildable.loc, cctx) :: cctxs)

diff --git a/test/blackbox-tests/test-cases/tests-stanza/dune b/test/blackbox-tests/test-cases/tests-stanza/dune
diff --git a/test/blackbox-tests/test-cases/tests-stanza/generated/dune b/test/blackbox-tests/test-cases/tests-stanza/generated/dune
@@ -0,0 +1,6 @@
+(rule
+ (with-stdout-to generated.expected (echo "foo\nbar\n")))
+
+(test
+ (name generated)
+ (modules generated))
diff --git a/...ests/test-cases/tests-stanza/dune-project → ...cases/tests-stanza/generated/dune-project b/...ests/test-cases/tests-stanza/dune-project → ...cases/tests-stanza/generated/dune-project
diff --git a/test/blackbox-tests/test-cases/tests-stanza/generated/generated.ml b/test/blackbox-tests/test-cases/tests-stanza/generated/generated.ml
@@ -0,0 +1 @@
+let () = print_endline "foo\nbaz"
diff --git a/test/blackbox-tests/test-cases/tests-stanza/plural/dune b/test/blackbox-tests/test-cases/tests-stanza/plural/dune
@@ -0,0 +1,2 @@
+(tests
+ (names expect_test regular_test))
diff --git a/test/blackbox-tests/test-cases/tests-stanza/plural/dune-project b/test/blackbox-tests/test-cases/tests-stanza/plural/dune-project
@@ -0,0 +1 @@
+(lang dune 1.0)
diff --git a/...t-cases/tests-stanza/expect_test.expected → .../tests-stanza/plural/expect_test.expected b/...t-cases/tests-stanza/expect_test.expected → .../tests-stanza/plural/expect_test.expected
diff --git a/...ts/test-cases/tests-stanza/expect_test.ml → ...-cases/tests-stanza/plural/expect_test.ml b/...ts/test-cases/tests-stanza/expect_test.ml → ...-cases/tests-stanza/plural/expect_test.ml
diff --git a/...s/test-cases/tests-stanza/regular_test.ml → ...cases/tests-stanza/plural/regular_test.ml b/...s/test-cases/tests-stanza/regular_test.ml → ...cases/tests-stanza/plural/regular_test.ml
diff --git a/test/blackbox-tests/test-cases/tests-stanza/run.t b/test/blackbox-tests/test-cases/tests-stanza/run.t
@@ -1,10 +1,14 @@
-  $ dune runtest --display short
+  $ dune runtest --root singular --display short
+  Entering directory 'singular'
       ocamldep .singular.eobjs/singular.ml.d
         ocamlc .singular.eobjs/singular.{cmi,cmo,cmt}
       ocamlopt .singular.eobjs/singular.{cmx,o}
       ocamlopt singular.exe
       singular alias runtest
   singular test
+
+  $ dune runtest --root plural --display short
+  Entering directory 'plural'
       ocamldep .expect_test.eobjs/expect_test.ml.d
       ocamldep .expect_test.eobjs/regular_test.ml.d
         ocamlc .expect_test.eobjs/expect_test.{cmi,cmo,cmt}
@@ -16,3 +20,13 @@
       ocamlopt regular_test.exe
   regular_test alias runtest
   regular test
+  $ dune runtest --diff-command false --root generated --display short
+  Entering directory 'generated'
+      ocamldep .generated.eobjs/generated.ml.d
+        ocamlc .generated.eobjs/generated.{cmi,cmo,cmt}
+      ocamlopt .generated.eobjs/generated.{cmx,o}
+      ocamlopt generated.exe
+     generated generated.output
+            sh (internal) (exit 1)
+  (cd _build/default && /bin/sh -c 'false generated.expected generated.output')
+  [1]
diff --git a/test/blackbox-tests/test-cases/tests-stanza/singular/dune b/test/blackbox-tests/test-cases/tests-stanza/singular/dune
@@ -0,0 +1 @@
+(test (name singular))
diff --git a/test/blackbox-tests/test-cases/tests-stanza/singular/dune-project b/test/blackbox-tests/test-cases/tests-stanza/singular/dune-project
@@ -0,0 +1 @@
+(lang dune 1.0)
diff --git a/...tests/test-cases/tests-stanza/singular.ml → ...t-cases/tests-stanza/singular/singular.ml b/...tests/test-cases/tests-stanza/singular.ml → ...t-cases/tests-stanza/singular/singular.ml