From d2af91091caeb7ac3f1c9c08a2aa4a22a78d2640 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Sat, 13 Jan 2018 20:52:14 +0800 Subject: [PATCH] Update odoc tests These now work for libs defined in the same dir --- .../test-cases/multiple-private-libs/run.t | 6 ++++-- test/blackbox-tests/test-cases/odoc/run.t | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/test/blackbox-tests/test-cases/multiple-private-libs/run.t b/test/blackbox-tests/test-cases/multiple-private-libs/run.t index 8391b310..b909f1d8 100644 --- a/test/blackbox-tests/test-cases/multiple-private-libs/run.t +++ b/test/blackbox-tests/test-cases/multiple-private-libs/run.t @@ -7,9 +7,11 @@ This test checks that there is no clash when two private libraries have the same ocamldep b/test.depends.ocamldep-output ocamldep b/test.dependsi.ocamldep-output ocamlc a/test.{cmi,cmo,cmt} + odoc _doc/test@a/page-index.odoc ocamlc b/test.{cmi,cmo,cmt} - odoc a/test.odoc - odoc b/test.odoc + odoc _doc/test@b/page-index.odoc + odoc _doc/test@a/test.odoc + odoc _doc/test@b/test.odoc odoc _doc/test@a/index.html odoc _doc/test@a/Test/.jbuilder-keep,_doc/test@a/Test/index.html odoc _doc/test@b/index.html diff --git a/test/blackbox-tests/test-cases/odoc/run.t b/test/blackbox-tests/test-cases/odoc/run.t index 66674bc8..cd4b7920 100644 --- a/test/blackbox-tests/test-cases/odoc/run.t +++ b/test/blackbox-tests/test-cases/odoc/run.t @@ -5,12 +5,18 @@ ocamldep foo.dependsi.ocamldep-output odoc _doc/odoc.css ocamlc foo_byte.{cmi,cmo,cmt} + odoc _doc/foo.byte/page-index.odoc + odoc _doc/foo.byte/page-test.odoc ocamlc foo.{cmi,cmo,cmt} - odoc foo_byte.odoc - odoc foo.odoc + odoc _doc/foo/page-index.odoc + odoc _doc/foo/page-test.odoc + odoc _doc/foo.byte/foo_byte.odoc + odoc _doc/foo/foo.odoc odoc _doc/foo.byte/index.html + odoc _doc/foo.byte/test.html odoc _doc/foo.byte/Foo_byte/.jbuilder-keep,_doc/foo.byte/Foo_byte/index.html odoc _doc/foo/index.html + odoc _doc/foo/test.html odoc _doc/foo/Foo/.jbuilder-keep,_doc/foo/Foo/index.html $ $JBUILDER runtest -j1 --root .