Merge pull request #162 from Julow/gen-test-rules

- Generate test rules
- Fix printing of --prelude-str option

Author: Julow

bin/rule.ml

@@ -99,7 +99,7 @@ let pp_direction fmt = function
   | `To_ml -> Fmt.pf fmt "--direction=to-ml"
 
 let pp_prelude fmt s = Fmt.pf fmt "--prelude=%s" s
-let pp_prelude_str fmt s = Fmt.pf fmt "--prelude-str=%S" s
+let pp_prelude_str fmt s = Fmt.pf fmt "--prelude-str %S" s
 
 let add_opt e s = match e with None -> s | Some e -> String.Set.add e s
 

test/dune

@@ -1,3 +1,41 @@
+(include dune.inc)
+
+; Generates rules
+
+(rule
+ (targets dune.inc.gen)
+ (deps    (package mdx))
+ (action
+  (with-stdout-to %{targets}
+   (progn
+    (run ocaml-mdx rule %{dep:pp.md})
+    (run ocaml-mdx rule %{dep:ellipsis.md})
+    (run ocaml-mdx rule %{dep:envs.md})
+    (run ocaml-mdx rule %{dep:empty_line.md})
+    (run ocaml-mdx rule %{dep:spaces.md})
+    (run ocaml-mdx rule %{dep:errors.md})
+    (run ocaml-mdx rule %{dep:heredoc.md})
+    (run ocaml-mdx rule %{dep:mlt.md})
+    (run ocaml-mdx rule %{dep:semisemi.md})
+    (run ocaml-mdx rule %{dep:exit.md})
+    (run ocaml-mdx rule %{dep:padding.md})
+    (run ocaml-mdx rule %{dep:multilines.md})
+    (run ocaml-mdx rule %{dep:lines.md})
+    (run ocaml-mdx rule %{dep:lwt.md})
+    (run ocaml-mdx rule %{dep:non-det.md})
+    (run ocaml-mdx rule %{dep:code.md})
+    (run ocaml-mdx rule %{dep:set_environment_variable.md})
+    (run ocaml-mdx rule %{dep:unset_environment_variable.md})
+    (run ocaml-mdx rule --prelude-str "#require \"lwt\"" --prelude-str "toto:let x = \"42\"" %{dep:prelude.md})
+    (run ocaml-mdx rule --prelude prelude.ml %{dep:prelude_file.md})
+    (run ocaml-mdx rule --direction=to-ml %{dep:dune_rules.md})
+    (run ocaml-mdx rule %{dep:require/require-package.md})
+   ))))
+
+(alias
+ (name runtest)
+ (action (diff dune.inc dune.inc.gen)))
+
 (alias
  (name   runtest)
  (deps   (:x section.md) (:y section.md.expected) (package mdx))
@@ -26,27 +64,6 @@
            (run ocaml-mdx test --force-output %{x})
            (diff? %{y} %{x}.corrected))))
 
-(alias
- (name   runtest)
- (deps   (:x ellipsis.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x envs.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x empty_line.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
 (alias
  (name   runtest)
  (deps   (:x empty_lines.md) (:y empty_lines.md.expected) (package mdx))
@@ -61,97 +78,13 @@
            (run ocaml-mdx output %{x} -o output.html)
            (diff? %{y} output.html))))
 
-(alias
- (name   runtest)
- (deps   (:x spaces.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
 (alias
  (name   runtest)
  (deps   (:x cram.t) (package mdx))
  (action (progn
            (run ocaml-mdx test --syntax=cram %{x})
            (diff? %{x} %{x}.corrected))))
 
-(alias
- (name   runtest)
- (deps   (:x errors.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x heredoc.md) section.md (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x mlt.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x semisemi.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x exit.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x padding.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x multilines.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x lines.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x lwt.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x non-det.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x code.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
 (alias
  (name   runtest)
  (deps   (:x dir.md) (package mdx))
@@ -167,40 +100,6 @@
  (action (progn
            (run ocaml-mdx test --force-output --root=.. %{x})
            (diff? %{y} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x set_environment_variable.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x unset_environment_variable.md) (package mdx))
- (action (progn
-           (run ocaml-mdx test %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x prelude.md) (package mdx))
- (action (progn
-           (run ocaml-mdx
-                  test
-                  --prelude-str "#require \"lwt\""
-                  --prelude-str "toto:let x = \"42\""
-                  %{x})
-           (diff? %{x} %{x}.corrected))))
-
-(alias
- (name   runtest)
- (deps   (:x prelude_file.md) prelude.ml (package mdx))
- (action (progn
-           (run ocaml-mdx test --prelude prelude.ml %{x})
-           (diff? %{x} %{x}.corrected))))
-
-
 (alias
  (name   runtest)
  (deps   (:x sync_to_md.md)
@@ -257,23 +156,3 @@
  (name   runtest)
  (deps   (:x section.out) (:y section.out.expected))
  (action (diff? %{x} %{y})))
-
-(include dune_rules.inc)
-
-(rule
- (targets dune_rules.inc.gen)
- (deps    (source_tree test-cases) (:x dune_rules.md) (package mdx))
- (action  (with-stdout-to %{targets} (run ocaml-mdx rule --direction=to-ml %{x}))))
-
-(alias
- (name runtest)
- (action (diff dune_rules.inc dune_rules.inc.gen)))
-
-(alias
- (name   runtest)
- (deps   (:x require/require-package.md)
-         (package mdx)
-         (package example_lib))
- (action (progn
-           (run ocaml-mdx test --direction=infer-timestamp %{x})
-           (diff? %{x} %{x}.corrected))))