diff options
Diffstat (limited to 'testsuite/tests/tool-ocamldoc')
42 files changed, 74 insertions, 61 deletions
diff --git a/testsuite/tests/tool-ocamldoc/Alert_toplevel.html.reference b/testsuite/tests/tool-ocamldoc/Alert_toplevel.html.reference index db844172f3..5c04050722 100644 --- a/testsuite/tests/tool-ocamldoc/Alert_toplevel.html.reference +++ b/testsuite/tests/tool-ocamldoc/Alert_toplevel.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Alert_toplevel.mli b/testsuite/tests/tool-ocamldoc/Alert_toplevel.mli index 4b67c2d769..73a9e74625 100644 --- a/testsuite/tests/tool-ocamldoc/Alert_toplevel.mli +++ b/testsuite/tests/tool-ocamldoc/Alert_toplevel.mli @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with html + ocamldoc with html; *) (** There's a top-comment before. *) diff --git a/testsuite/tests/tool-ocamldoc/Alert_toplevel2.html.reference b/testsuite/tests/tool-ocamldoc/Alert_toplevel2.html.reference index 74c43e22eb..ae9af6b025 100644 --- a/testsuite/tests/tool-ocamldoc/Alert_toplevel2.html.reference +++ b/testsuite/tests/tool-ocamldoc/Alert_toplevel2.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Alert_toplevel2.mli b/testsuite/tests/tool-ocamldoc/Alert_toplevel2.mli index a31bab4304..9284a7db66 100644 --- a/testsuite/tests/tool-ocamldoc/Alert_toplevel2.mli +++ b/testsuite/tests/tool-ocamldoc/Alert_toplevel2.mli @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with html + ocamldoc with html; *) [@@@alert deprecated "foo"] diff --git a/testsuite/tests/tool-ocamldoc/Alerts.html.reference b/testsuite/tests/tool-ocamldoc/Alerts.html.reference index 0309559d6e..8441b6dd30 100644 --- a/testsuite/tests/tool-ocamldoc/Alerts.html.reference +++ b/testsuite/tests/tool-ocamldoc/Alerts.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Alerts.mli b/testsuite/tests/tool-ocamldoc/Alerts.mli index 95846b0a19..c2d0a44f31 100644 --- a/testsuite/tests/tool-ocamldoc/Alerts.mli +++ b/testsuite/tests/tool-ocamldoc/Alerts.mli @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with html + ocamldoc with html; *) (** Test the rendering of alerts. *) diff --git a/testsuite/tests/tool-ocamldoc/Alerts_impl.html.reference b/testsuite/tests/tool-ocamldoc/Alerts_impl.html.reference index 17672fc545..8f7c33bed4 100644 --- a/testsuite/tests/tool-ocamldoc/Alerts_impl.html.reference +++ b/testsuite/tests/tool-ocamldoc/Alerts_impl.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Alerts_impl.ml b/testsuite/tests/tool-ocamldoc/Alerts_impl.ml index db38c1e573..e542af37d1 100644 --- a/testsuite/tests/tool-ocamldoc/Alerts_impl.ml +++ b/testsuite/tests/tool-ocamldoc/Alerts_impl.ml @@ -1,6 +1,6 @@ (* TEST - * ocamldoc with html - *) + ocamldoc with html; +*) (** Alerts from implementation. *) diff --git a/testsuite/tests/tool-ocamldoc/Documentation_tags.html.reference b/testsuite/tests/tool-ocamldoc/Documentation_tags.html.reference index 683c6c099f..90955fe369 100644 --- a/testsuite/tests/tool-ocamldoc/Documentation_tags.html.reference +++ b/testsuite/tests/tool-ocamldoc/Documentation_tags.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Documentation_tags.mli b/testsuite/tests/tool-ocamldoc/Documentation_tags.mli index 0dadce6610..cffb06626d 100644 --- a/testsuite/tests/tool-ocamldoc/Documentation_tags.mli +++ b/testsuite/tests/tool-ocamldoc/Documentation_tags.mli @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with html + ocamldoc with html; *) (** Test the html rendering of ocamldoc documentation tags *) diff --git a/testsuite/tests/tool-ocamldoc/Entities.html.reference b/testsuite/tests/tool-ocamldoc/Entities.html.reference index 0ef46358b3..dde148dd10 100644 --- a/testsuite/tests/tool-ocamldoc/Entities.html.reference +++ b/testsuite/tests/tool-ocamldoc/Entities.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Entities.ml b/testsuite/tests/tool-ocamldoc/Entities.ml index 218817eed8..ce48d6755b 100644 --- a/testsuite/tests/tool-ocamldoc/Entities.ml +++ b/testsuite/tests/tool-ocamldoc/Entities.ml @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with html + ocamldoc with html; *) type ul diff --git a/testsuite/tests/tool-ocamldoc/Extensible_variant.ml b/testsuite/tests/tool-ocamldoc/Extensible_variant.ml index f459fa276b..7202a8475c 100644 --- a/testsuite/tests/tool-ocamldoc/Extensible_variant.ml +++ b/testsuite/tests/tool-ocamldoc/Extensible_variant.ml @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with latex + ocamldoc with latex; *) (** Testing display of extensible variant types and exceptions. diff --git a/testsuite/tests/tool-ocamldoc/Include_module_type_of.html.reference b/testsuite/tests/tool-ocamldoc/Include_module_type_of.html.reference index 1619e2180a..b0b9089f90 100644 --- a/testsuite/tests/tool-ocamldoc/Include_module_type_of.html.reference +++ b/testsuite/tests/tool-ocamldoc/Include_module_type_of.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Include_module_type_of.mli b/testsuite/tests/tool-ocamldoc/Include_module_type_of.mli index c30432d472..b33cbb5c5c 100644 --- a/testsuite/tests/tool-ocamldoc/Include_module_type_of.mli +++ b/testsuite/tests/tool-ocamldoc/Include_module_type_of.mli @@ -1,6 +1,9 @@ (* TEST - * ocamldoc with html - * ocamldoc with latex + { + ocamldoc with html; + }{ + ocamldoc with latex; + } *) (** Test [include module type of...] variants *) diff --git a/testsuite/tests/tool-ocamldoc/Inline_records.html.reference b/testsuite/tests/tool-ocamldoc/Inline_records.html.reference index cab1cd55d8..2a53b4673b 100644 --- a/testsuite/tests/tool-ocamldoc/Inline_records.html.reference +++ b/testsuite/tests/tool-ocamldoc/Inline_records.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Inline_records.mli b/testsuite/tests/tool-ocamldoc/Inline_records.mli index 5b4646d9e1..1f5a15e667 100644 --- a/testsuite/tests/tool-ocamldoc/Inline_records.mli +++ b/testsuite/tests/tool-ocamldoc/Inline_records.mli @@ -1,7 +1,11 @@ (* TEST - * ocamldoc with html - * ocamldoc with latex - * ocamldoc with man + { + ocamldoc with html; + }{ + ocamldoc with latex; + }{ + ocamldoc with man; + } *) (** diff --git a/testsuite/tests/tool-ocamldoc/Inline_records_bis.ml b/testsuite/tests/tool-ocamldoc/Inline_records_bis.ml index 4844aaf27a..970912b3f8 100644 --- a/testsuite/tests/tool-ocamldoc/Inline_records_bis.ml +++ b/testsuite/tests/tool-ocamldoc/Inline_records_bis.ml @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with latex + ocamldoc with latex; *) (** diff --git a/testsuite/tests/tool-ocamldoc/Item_ids.html.reference b/testsuite/tests/tool-ocamldoc/Item_ids.html.reference index c3b66f3e79..460831c2a9 100644 --- a/testsuite/tests/tool-ocamldoc/Item_ids.html.reference +++ b/testsuite/tests/tool-ocamldoc/Item_ids.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Item_ids.mli b/testsuite/tests/tool-ocamldoc/Item_ids.mli index 878c6fef30..744fd9d239 100644 --- a/testsuite/tests/tool-ocamldoc/Item_ids.mli +++ b/testsuite/tests/tool-ocamldoc/Item_ids.mli @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with html + ocamldoc with html; *) (** Check that all toplevel items are given a unique id. *) diff --git a/testsuite/tests/tool-ocamldoc/Level_0.mli b/testsuite/tests/tool-ocamldoc/Level_0.mli index f7ac2a888e..3bd9aea977 100644 --- a/testsuite/tests/tool-ocamldoc/Level_0.mli +++ b/testsuite/tests/tool-ocamldoc/Level_0.mli @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with latex + ocamldoc with latex; *) (** Test for level 0 headings diff --git a/testsuite/tests/tool-ocamldoc/Linebreaks.html.reference b/testsuite/tests/tool-ocamldoc/Linebreaks.html.reference index 58ad73e63a..66b0dd9df2 100644 --- a/testsuite/tests/tool-ocamldoc/Linebreaks.html.reference +++ b/testsuite/tests/tool-ocamldoc/Linebreaks.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Linebreaks.mli b/testsuite/tests/tool-ocamldoc/Linebreaks.mli index 1dce3838b8..1baf3db314 100644 --- a/testsuite/tests/tool-ocamldoc/Linebreaks.mli +++ b/testsuite/tests/tool-ocamldoc/Linebreaks.mli @@ -1,8 +1,8 @@ (* TEST - * ocamldoc with html - ** check-program-output - output="type_Linebreaks.html" - reference="${test_source_directory}/type_Linebreaks.reference" + ocamldoc with html; + output = "type_Linebreaks.html"; + reference = "${test_source_directory}/type_Linebreaks.reference"; + check-program-output; *) (** diff --git a/testsuite/tests/tool-ocamldoc/Loop.html.reference b/testsuite/tests/tool-ocamldoc/Loop.html.reference index 74ad9a7eaf..30c2864f03 100644 --- a/testsuite/tests/tool-ocamldoc/Loop.html.reference +++ b/testsuite/tests/tool-ocamldoc/Loop.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Loop.ml b/testsuite/tests/tool-ocamldoc/Loop.ml index 8428f9fc15..b3c4f6888e 100644 --- a/testsuite/tests/tool-ocamldoc/Loop.ml +++ b/testsuite/tests/tool-ocamldoc/Loop.ml @@ -1,5 +1,8 @@ (* TEST - * ocamldoc with html - * ocamldoc with latex + { + ocamldoc with html; + }{ + ocamldoc with latex; + } *) module rec A : sig type t end = B and B : sig type t = A.t end = A;; diff --git a/testsuite/tests/tool-ocamldoc/Module_whitespace.html.reference b/testsuite/tests/tool-ocamldoc/Module_whitespace.html.reference index c528be1c1f..2f5252e27c 100644 --- a/testsuite/tests/tool-ocamldoc/Module_whitespace.html.reference +++ b/testsuite/tests/tool-ocamldoc/Module_whitespace.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Module_whitespace.ml b/testsuite/tests/tool-ocamldoc/Module_whitespace.ml index 75c6c29274..7b3723d6cf 100644 --- a/testsuite/tests/tool-ocamldoc/Module_whitespace.ml +++ b/testsuite/tests/tool-ocamldoc/Module_whitespace.ml @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with html + ocamldoc with html; *) module M = Set.Make(struct diff --git a/testsuite/tests/tool-ocamldoc/No_preamble.html.reference b/testsuite/tests/tool-ocamldoc/No_preamble.html.reference index 0f3867016c..3125b08df4 100644 --- a/testsuite/tests/tool-ocamldoc/No_preamble.html.reference +++ b/testsuite/tests/tool-ocamldoc/No_preamble.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/No_preamble.mli b/testsuite/tests/tool-ocamldoc/No_preamble.mli index 7d016dda22..ea8a655f19 100644 --- a/testsuite/tests/tool-ocamldoc/No_preamble.mli +++ b/testsuite/tests/tool-ocamldoc/No_preamble.mli @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with html + ocamldoc with html; *) open String diff --git a/testsuite/tests/tool-ocamldoc/Paragraph.html.reference b/testsuite/tests/tool-ocamldoc/Paragraph.html.reference index 7cc2bc1fff..b132f065ad 100644 --- a/testsuite/tests/tool-ocamldoc/Paragraph.html.reference +++ b/testsuite/tests/tool-ocamldoc/Paragraph.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Paragraph.mli b/testsuite/tests/tool-ocamldoc/Paragraph.mli index 8073c7cd99..73e39e9412 100644 --- a/testsuite/tests/tool-ocamldoc/Paragraph.mli +++ b/testsuite/tests/tool-ocamldoc/Paragraph.mli @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with html + ocamldoc with html; *) (** This file tests the generation of paragraph within module comments. diff --git a/testsuite/tests/tool-ocamldoc/Short_description.latex.reference b/testsuite/tests/tool-ocamldoc/Short_description.latex.reference index 4a938e4168..26241644c1 100644 --- a/testsuite/tests/tool-ocamldoc/Short_description.latex.reference +++ b/testsuite/tests/tool-ocamldoc/Short_description.latex.reference @@ -8,7 +8,7 @@ \begin{document} \tableofcontents \section{Short\_description : (* TEST - * ocamldoc with latex + ocamldoc with latex; *)} \label{Short-underscoredescription}\index{Short-underscoredescription@\verb`Short_description`} diff --git a/testsuite/tests/tool-ocamldoc/Short_description.txt b/testsuite/tests/tool-ocamldoc/Short_description.txt index e0021ea697..12a063ba60 100644 --- a/testsuite/tests/tool-ocamldoc/Short_description.txt +++ b/testsuite/tests/tool-ocamldoc/Short_description.txt @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with latex + ocamldoc with latex; *) Short global description in text mode diff --git a/testsuite/tests/tool-ocamldoc/Test.mli b/testsuite/tests/tool-ocamldoc/Test.mli index b28c8e734e..cbb4aa6a21 100644 --- a/testsuite/tests/tool-ocamldoc/Test.mli +++ b/testsuite/tests/tool-ocamldoc/Test.mli @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with latex + ocamldoc with latex; *) (** Ten comments for tests *) diff --git a/testsuite/tests/tool-ocamldoc/Variants.html.reference b/testsuite/tests/tool-ocamldoc/Variants.html.reference index 0858bde168..35733fe8a4 100644 --- a/testsuite/tests/tool-ocamldoc/Variants.html.reference +++ b/testsuite/tests/tool-ocamldoc/Variants.html.reference @@ -1,4 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/testsuite/tests/tool-ocamldoc/Variants.mli b/testsuite/tests/tool-ocamldoc/Variants.mli index 137a42ce6d..ba6de5b455 100644 --- a/testsuite/tests/tool-ocamldoc/Variants.mli +++ b/testsuite/tests/tool-ocamldoc/Variants.mli @@ -1,6 +1,9 @@ (* TEST - * ocamldoc with html - * ocamldoc with latex + { + ocamldoc with html; + }{ + ocamldoc with latex; + } *) (** This test is here to check the latex code generated for variants *) diff --git a/testsuite/tests/tool-ocamldoc/latex_ref.mli b/testsuite/tests/tool-ocamldoc/latex_ref.mli index 8424aa891f..9ed1a8f86a 100644 --- a/testsuite/tests/tool-ocamldoc/latex_ref.mli +++ b/testsuite/tests/tool-ocamldoc/latex_ref.mli @@ -1,5 +1,5 @@ (* TEST - * ocamldoc with latex + ocamldoc with latex; *) (** Latex-only test *) diff --git a/testsuite/tests/tool-ocamldoc/t01.ml b/testsuite/tests/tool-ocamldoc/t01.ml index 1003b47f2d..9d76ba51ff 100644 --- a/testsuite/tests/tool-ocamldoc/t01.ml +++ b/testsuite/tests/tool-ocamldoc/t01.ml @@ -1,7 +1,7 @@ (* TEST - plugins="odoc_test.ml" - * ocamldoc - flags="-I ${ocamlsrcdir}/ocamldoc" + plugins = "odoc_test.ml"; + flags = "-I ${ocamlsrcdir}/ocamldoc"; + ocamldoc; *) (** Testing display of types. diff --git a/testsuite/tests/tool-ocamldoc/t02.ml b/testsuite/tests/tool-ocamldoc/t02.ml index a2280cf8f3..4dbef6c167 100644 --- a/testsuite/tests/tool-ocamldoc/t02.ml +++ b/testsuite/tests/tool-ocamldoc/t02.ml @@ -1,7 +1,7 @@ (* TEST - plugins="odoc_test.ml" - * ocamldoc - flags="-I ${ocamlsrcdir}/ocamldoc" + plugins = "odoc_test.ml"; + flags = "-I ${ocamlsrcdir}/ocamldoc"; + ocamldoc; *) module Foo = struct type u type t = int let x = 1 end;; diff --git a/testsuite/tests/tool-ocamldoc/t03.ml b/testsuite/tests/tool-ocamldoc/t03.ml index 3ee319ba02..69022bb03a 100644 --- a/testsuite/tests/tool-ocamldoc/t03.ml +++ b/testsuite/tests/tool-ocamldoc/t03.ml @@ -1,7 +1,7 @@ (* TEST - plugins="odoc_test.ml" - * ocamldoc - flags="-I ${ocamlsrcdir}/ocamldoc" + plugins = "odoc_test.ml"; + flags = "-I ${ocamlsrcdir}/ocamldoc"; + ocamldoc; *) module Foo = struct type t = int let x = 1 end;; diff --git a/testsuite/tests/tool-ocamldoc/t04.ml b/testsuite/tests/tool-ocamldoc/t04.ml index d815b4ccc0..85d1fe59ca 100644 --- a/testsuite/tests/tool-ocamldoc/t04.ml +++ b/testsuite/tests/tool-ocamldoc/t04.ml @@ -1,7 +1,7 @@ (* TEST - plugins="odoc_test.ml" - * ocamldoc - flags="-I ${ocamlsrcdir}/ocamldoc" + plugins = "odoc_test.ml"; + flags = "-I ${ocamlsrcdir}/ocamldoc"; + ocamldoc; *) (** Testing display of inline record. diff --git a/testsuite/tests/tool-ocamldoc/t05.ml b/testsuite/tests/tool-ocamldoc/t05.ml index 885dc90a32..f5fb0b98e6 100644 --- a/testsuite/tests/tool-ocamldoc/t05.ml +++ b/testsuite/tests/tool-ocamldoc/t05.ml @@ -1,7 +1,7 @@ (* TEST - plugins="odoc_test.ml" - * ocamldoc - flags="-I ${ocamlsrcdir}/ocamldoc" + plugins = "odoc_test.ml"; + flags = "-I ${ocamlsrcdir}/ocamldoc"; + ocamldoc; *) module rec A : sig type t end = B and B : sig type t = A.t end = A;; |