Fix tests on OCaml 4.06

alavrik · Feb 13, 2018 · 7334da1 · 7334da1
1 parent 336e8fd
commit 7334da1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/examples/custom-types/Makefile b/examples/custom-types/Makefile
@@ -11,7 +11,7 @@ SOURCES = \
 
 
 export OCAMLPATH := ../..:$(OCAMLPATH)
-PACKS = piqirun.pb num
+PACKS = piqirun.pb #num
 
 
 PIQI_FILES = example.piqi skvl.piqi

diff --git a/examples/custom-types/piqirun_custom.ml b/examples/custom-types/piqirun_custom.ml
@@ -19,10 +19,18 @@ let nativeint_to_int: nativeint -> int = Nativeint.to_int
 (* mapping OCaml big_int to Piqi string (by representing number as a decimal
  * string)
  *)
+(*
+(* Used to work with OCaml < 4.06 -- commenting out for now; XXX: support num |
+ * base-num as test dependency *)
 type bigint = Big_int.big_int
 
 let bigint_of_string: string -> bigint = Big_int.big_int_of_string
 let bigint_to_string: bigint -> string = Big_int.string_of_big_int
+*)
+type bigint = string
+
+let bigint_of_string (x: string) :bigint = x
+let bigint_to_string (x: bigint) :string = x
 
 
 

diff --git a/tests/perf/test.ml b/tests/perf/test.ml
@@ -2,10 +2,10 @@
 let read_file filename =
   let ch = open_in_bin filename in
   let size = in_channel_length ch in
-  let res = String.create size in
+  let res = Bytes.create size in
   really_input ch res 0 size;
   close_in ch;
-  res
+  Bytes.unsafe_to_string res
 
 
 let string_of_format = function