Skip to content

Commit e88437a

Browse files
committed
OxCaml: fix OCaml CI, ignore recent_impl test
1 parent 9af15db commit e88437a

File tree

7 files changed

+139
-46
lines changed

7 files changed

+139
-46
lines changed

test/generators/gen_rules/gen_rules.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ let constraints =
6262
("ocamlary.mli", Min "4.14");
6363
("recent.mli", Min "5.4");
6464
("labels.mli", Min "4.09");
65-
("recent_impl.ml", Min "4.09");
65+
("recent_impl.ml", MinNotOxCaml "4.09");
6666
("bugs_pre_410.ml", Max "4.09");
6767
("module_type_subst.mli", Min "4.13");
6868
("class_comments.mli", Min "4.08");

test/generators/gen_rules_lib.ml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ type enabledif =
77
| Max of string
88
| MinMax of string * string
99
| OxCaml
10+
| MinNotOxCaml of string
1011

1112
type test_case = {
1213
input : Fpath.t;
@@ -54,6 +55,19 @@ module Dune = struct
5455
];
5556
]
5657
| Some OxCaml -> [ List [ Atom "enabled_if"; Atom "%{ocaml-config:ox}" ] ]
58+
| Some (MinNotOxCaml v) ->
59+
[
60+
List
61+
[
62+
Atom "enabled_if";
63+
List
64+
[
65+
Atom "and";
66+
List [ Atom ">="; Atom "%{ocaml_version}"; Atom v ];
67+
List [ Atom "not"; Atom "%{ocaml-config:ox}" ];
68+
];
69+
];
70+
]
5771
| None -> []
5872

5973
let run cmd = List (Atom "run" :: arg_list cmd)

test/generators/html/Recent_impl-B.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ <h1>Module <code><span>Recent_impl.B</span></code></h1>
1919
<div class="odoc-spec">
2020
<div class="spec type anchored" id="type-t">
2121
<a href="#type-t" class="anchor"></a>
22-
<code><span><span class="keyword">type</span> t : immediate</span>
23-
<span> = </span>
22+
<code><span><span class="keyword">type</span> t</span><span> = </span>
2423
</code>
2524
<ol>
2625
<li id="type-t.B" class="def variant constructor anchored">

test/generators/latex/Recent_impl.B.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
\section{Module \ocamlinlinecode{Recent\_\allowbreak{}impl.\allowbreak{}B}}\label{Recent_impl-B}%
2-
\label{Recent_impl-B--type-t}\ocamlcodefragment{\ocamltag{keyword}{type} t : immediate = }\\
2+
\label{Recent_impl-B--type-t}\ocamlcodefragment{\ocamltag{keyword}{type} t = }\\
33
\begin{ocamltabular}{p{1.000\textwidth}}\ocamlcodefragment{| \ocamltag{constructor}{B}}\label{Recent_impl-B--type-t.B}\\
44
\end{ocamltabular}%
55
\\

0 commit comments

Comments
 (0)