Skip to content

Commit 2e2cc45

Browse files
JulowJulow
authored
Merge pull request ocaml#1061 from Julow/fix-tests-240
Update lower bounds and fix tests on < 4.10 and macos
2 parents 5b395bc + 59ebebe commit 2e2cc45

File tree

10 files changed

+7
-21
lines changed

10 files changed

+7
-21
lines changed

‎odoc-parser.opam‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ build: [
3131
"-j"
3232
jobs
3333
"@install"
34-
"@runtest" {with-test}
34+
# Tests are not all associated with a package and would be run if using the
35+
# default '@runtest'.
36+
"@src/parser/runtest" {with-test}
3537
]
3638
]
37-

‎odoc.opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ depends: [
5757

5858
"ppx_expect" {with-test}
5959
"bos" {with-test}
60-
"crunch"
60+
"crunch" {> "1.1.0"}
6161

6262
("ocaml" {< "4.07.0" & with-test} | "bisect_ppx" {with-test & > "2.5.0"})
6363
]

‎src/parser/test/dune‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
(library
22
(name odoc_parser_test)
3+
(package odoc-parser)
34
(inline_tests)
45
(enabled_if
56
(>= %{ocaml_version} 4.04.1))

‎test/generators/html/Bugs_pre_410.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html xmlns="http://www.w3.org/1999/xhtml">
3-
<head><title>Bugs_pre_410 (Bugs_pre_410)</title>
4-
<link rel="stylesheet" href="odoc.css"/><meta charset="utf-8"/>
3+
<head><title>Bugs_pre_410 (Bugs_pre_410)</title><meta charset="utf-8"/>
4+
<link rel="stylesheet" href="odoc.css"/>
55
<meta name="generator" content="odoc %%VERSION%%"/>
66
<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
77
<script src="highlight.pack.js"></script>

‎test/integration/simple_dune_project.t/bar.ml‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/integration/simple_dune_project.t/dune‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎test/integration/simple_dune_project.t/dune-project‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/integration/simple_dune_project.t/dune_odoc_test.opam‎

Whitespace-only changes.

‎test/integration/simple_dune_project.t/foo.ml‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/integration/simple_dune_project.t/run.t‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)