Fix tests on 4.07+

This sets the error style to short, so it should work on previous compilers as well Closes #263
mirage · Nov 24, 2019 · d696925 · d696925
1 parent a5aa404
commit d696925
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/ppx_cstruct.opam b/ppx_cstruct.opam
@@ -25,6 +25,7 @@ depends: [
   "ppx_sexp_conv" {with-test}
   "sexplib" {>="v0.9.0"}
   "cstruct-sexp" {with-test}
+  "cppo" {with-test}
   "cstruct-unix" {with-test & =version}
   "stdlib-shims"
 ]

diff --git a/ppx_test/errors/dune b/ppx_test/errors/dune
@@ -1,6 +1,8 @@
 (executable
   (name pp)
   (modules pp)
+  (preprocess (action
+    (run %{bin:cppo} -V OCAML:%{ocaml_version} %{input-file})))
   (libraries
     ppx_cstruct
     ocaml-migrate-parsetree))

diff --git a/ppx_test/errors/gen_tests.ml b/ppx_test/errors/gen_tests.ml
@@ -19,6 +19,7 @@ let output_stanzas name =
 
 let is_test = function
   | "pp.ml" -> false
+  | "pp.pp.ml" -> false
   | "gen_tests.ml" -> false
   | e -> Filename.check_suffix e ".ml"
 

diff --git a/ppx_test/errors/pp.ml b/ppx_test/errors/pp.ml
@@ -3,4 +3,8 @@
 external sys_exit : int -> 'a = "caml_sys_exit"
 let () = at_exit (fun () -> sys_exit 0)
 
+#if OCAML_VERSION >= (4,7,0)
+let () = Clflags.(error_style := Some Short)
+#endif
+
 let () = Migrate_parsetree.Driver.run_main ()