Fix existing select tests

Use the new naming convention for selected modules Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
ocaml · Nov 7, 2019 · a8bfe60 · a8bfe60
1 parent 5d9156d
commit a8bfe60
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/...ox-tests/test-cases/select/bar_no_unix.ml → ...ox-tests/test-cases/select/bar.no_unix.ml b/...ox-tests/test-cases/select/bar_no_unix.ml → ...ox-tests/test-cases/select/bar.no_unix.ml
diff --git a/...ckbox-tests/test-cases/select/bar_unix.ml → ...ckbox-tests/test-cases/select/bar.unix.ml b/...ckbox-tests/test-cases/select/bar_unix.ml → ...ckbox-tests/test-cases/select/bar.unix.ml
diff --git a/...ckbox-tests/test-cases/select/foo_fake.ml → ...ckbox-tests/test-cases/select/foo.fake.ml b/...ckbox-tests/test-cases/select/foo_fake.ml → ...ckbox-tests/test-cases/select/foo.fake.ml
diff --git a/...ox-tests/test-cases/select/foo_no_fake.ml → ...ox-tests/test-cases/select/foo.no_fake.ml b/...ox-tests/test-cases/select/foo_no_fake.ml → ...ox-tests/test-cases/select/foo.no_fake.ml
diff --git a/test/blackbox-tests/test-cases/select/run.t b/test/blackbox-tests/test-cases/select/run.t
@@ -4,11 +4,11 @@
   >  (name main)
   >  (libraries
   >   (select bar.ml from
-  >    (unix -> bar_unix.ml)
-  >    (!unix -> bar_no_unix.ml))
+  >    (unix -> bar.unix.ml)
+  >    (!unix -> bar.no_unix.ml))
   >   (select foo.ml from
-  >    (fakefoobar -> foo_fake.ml)
-  >    (!fakefoobar -> foo_no_fake.ml))))
+  >    (fakefoobar -> foo.fake.ml)
+  >    (!fakefoobar -> foo.no_fake.ml))))
   > (alias
   >  (name runtest)
   >  (action (run ./main.exe)))
@@ -35,19 +35,26 @@
   >  (name main)
   >  (libraries
   >   (select bar.ml from
-  >    (unix -> bar_unix.ml)
-  >    (!unix -> bar_no_unix.ml))
+  >    (unix -> bar.unix.ml)
+  >    (!unix -> bar.no_unix.ml))
   >   (select foo.ml from
-  >    (fakefoobar -> foo_fake.ml)
-  >    (!fakefoobar -> foo_no_fake.ml))))
+  >    (fakefoobar -> foo.fake.ml)
+  >    (!fakefoobar -> foo.no_fake.ml))))
   > (rule
   >  (alias runtest)
   >  (action (run ./main.exe)))
   > EOF
 
   $ dune runtest --display short
-  File "dune", line 5, characters 12-23:
-  5 |    (unix -> bar_unix.ml)
-                  ^^^^^^^^^^^
-  Error: The prefix for files in this select branch must be "bar."
-  [1]
+        ocamlc .main.eobjs/byte/dune__exe.{cmi,cmo,cmt}
+        ocamlc .main.eobjs/byte/dune__exe__Bar.{cmi,cmo,cmt}
+      ocamlopt .main.eobjs/native/dune__exe__Bar.{cmx,o}
+        ocamlc .main.eobjs/byte/dune__exe__Foo.{cmi,cmo,cmt}
+        ocamlc .main.eobjs/byte/dune__exe__Main.{cmi,cmo,cmt}
+      ocamlopt .main.eobjs/native/dune__exe__Main.{cmx,o}
+      ocamlopt .main.eobjs/native/dune__exe.{cmx,o}
+      ocamlopt .main.eobjs/native/dune__exe__Foo.{cmx,o}
+      ocamlopt main.exe
+          main alias runtest
+  bar has unix
+  foo has no fake