Merge pull request #1061 from Julow/fix-tests-240

Update lower bounds and fix tests on < 4.10 and macos
ocaml · Dec 12, 2023 · 2e2cc45 · 2e2cc45
2 parents 5b395bc + 59ebebe
commit 2e2cc45
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 21 deletions.
diff --git a/odoc-parser.opam b/odoc-parser.opam
@@ -31,7 +31,8 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+    # Tests are not all associated with a package and would be run if using the
+    # default '@runtest'.
+    "@src/parser/runtest" {with-test}
   ]
 ]
-
diff --git a/odoc.opam b/odoc.opam
@@ -57,7 +57,7 @@ depends: [
 
   "ppx_expect" {with-test}
   "bos" {with-test}
-  "crunch"
+  "crunch" {> "1.1.0"}
 
   ("ocaml" {< "4.07.0" & with-test} | "bisect_ppx" {with-test & > "2.5.0"})
 ]

diff --git a/src/parser/test/dune b/src/parser/test/dune
@@ -1,5 +1,6 @@
 (library
  (name odoc_parser_test)
+ (package odoc-parser)
  (inline_tests)
  (enabled_if
   (>= %{ocaml_version} 4.04.1))

diff --git a/test/generators/html/Bugs_pre_410.html b/test/generators/html/Bugs_pre_410.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
- <head><title>Bugs_pre_410 (Bugs_pre_410)</title>
-  <link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
+ <head><title>Bugs_pre_410 (Bugs_pre_410)</title><meta charset="utf-8"/>
+  <link rel="stylesheet" href="odoc.css"/>
   <meta name="generator" content="odoc %%VERSION%%"/>
   <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
   <script src="highlight.pack.js"></script>

diff --git a/test/integration/simple_dune_project.t/bar.ml b/test/integration/simple_dune_project.t/bar.ml
diff --git a/test/integration/simple_dune_project.t/dune b/test/integration/simple_dune_project.t/dune
diff --git a/test/integration/simple_dune_project.t/dune-project b/test/integration/simple_dune_project.t/dune-project
diff --git a/test/integration/simple_dune_project.t/dune_odoc_test.opam b/test/integration/simple_dune_project.t/dune_odoc_test.opam
diff --git a/test/integration/simple_dune_project.t/foo.ml b/test/integration/simple_dune_project.t/foo.ml
diff --git a/test/integration/simple_dune_project.t/run.t b/test/integration/simple_dune_project.t/run.t