From 58a17202d7703a13b06b79cc3c3b24844c5cfbd5 Mon Sep 17 00:00:00 2001
From: Nathan Rebours <nathan.p.rebours@gmail.com>
Date: Wed, 4 Dec 2019 15:47:39 +0100
Subject: [PATCH 1/3] Re-enable mdx tests

---
 README.md       |  2 +-
 containers.opam |  3 ++-
 dune            | 14 +++++++-------
 dune-project    |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 1eda99e5..c8378c2b 100644
--- a/README.md
+++ b/README.md
@@ -366,7 +366,7 @@ val map : string IntMap.t = <abstr>
     (IntMap.pp CCFormat.int CCFormat.string_quoted)
     map;;
 map =
-  1->"1", 2->"2", 3->"3", 4->"4", 5->"5", 
+  1->"1", 2->"2", 3->"3", 4->"4", 5->"5",
   6->"6", 7->"7", 8->"8", 9->"9"
 - : unit = ()
 
diff --git a/containers.opam b/containers.opam
index 58cd7d58..eba67e11 100644
--- a/containers.opam
+++ b/containers.opam
@@ -10,7 +10,7 @@ build: [
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
-  "dune" { >= "1.1" }
+  "dune" { >= "1.11" }
   "dune-configurator"
   "result"
   "uchar"
@@ -21,6 +21,7 @@ depends: [
   "iter" { with-test }
   "gen" { with-test }
   "uutf" { with-test }
+  "mdx" { with-test & >= "1.5.0" & < "2.0.0" }
   "odoc" { with-doc }
   "ocaml" { >= "4.02.0" }
 ]
diff --git a/dune b/dune
index b630eb92..66a45a5e 100644
--- a/dune
+++ b/dune
@@ -1,8 +1,8 @@
+(rule
+ (target README.md.corrected)
+ (deps (package containers))
+ (action (run ocaml-mdx test %{dep:README.md} -o %{target})))
 
-;(alias
-; (name runtest)
-; (deps README.md)
-; (action (progn
-;          (run mdx test %{deps})
-;          (diff? %{deps} %{deps}.corrected))))
-
+(alias
+ (name runtest)
+ (action (diff README.md README.md.corrected)))
diff --git a/dune-project b/dune-project
index de4fc209..0636ab6a 100644
--- a/dune-project
+++ b/dune-project
@@ -1 +1 @@
-(lang dune 1.0)
+(lang dune 1.11)

From b3bfa82ccb818a1d7760f092025288d7a147ce2b Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Tue, 10 Dec 2019 15:21:51 -0600
Subject: [PATCH 2/3] use older dune dialect

---
 dune | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dune b/dune
index 66a45a5e..2dd4be13 100644
--- a/dune
+++ b/dune
@@ -1,7 +1,7 @@
 (rule
- (target README.md.corrected)
+ (targets README.md.corrected)
  (deps (package containers))
- (action (run ocaml-mdx test %{dep:README.md} -o %{target})))
+ (action (run ocaml-mdx test %{dep:README.md} -o %{targets})))
 
 (alias
  (name runtest)

From 480a7f85fcde2ac59a76e9da976b3588463f8141 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Tue, 10 Dec 2019 15:22:08 -0600
Subject: [PATCH 3/3] older dune dialect

---
 dune-project | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dune-project b/dune-project
index 0636ab6a..7655de07 100644
--- a/dune-project
+++ b/dune-project
@@ -1 +1 @@
-(lang dune 1.11)
+(lang dune 1.1)