QCheck 1/2 expect tests

example/alcotest/dune

@@ -6,7 +6,6 @@
 (rule
   (targets output.txt)
   (deps ./QCheck_alcotest_test.exe)
-  (package qcheck-alcotest)
   (enabled_if (= %{os_type} "Unix"))
   (action
     (with-accepted-exit-codes
@@ -19,5 +18,6 @@
 
 (rule
   (alias runtest)
+  (package qcheck-alcotest)
   (enabled_if (= %{os_type} "Unix"))
   (action (diff output.txt.expected output.txt)))

example/dune

@@ -6,7 +6,6 @@
 (rule
   (targets output.txt)
   (deps ./QCheck_runner_test.exe)
-  (package qcheck-core)
   (enabled_if (= %{os_type} "Unix"))
   (action
     (with-accepted-exit-codes
@@ -18,4 +17,5 @@
 (rule
   (alias runtest)
   (enabled_if (= %{os_type} "Unix"))
+  (package qcheck)
   (action (diff output.txt.expected output.txt)))

example/ounit/dune

@@ -1,12 +1,11 @@
 
 (executables
   (names QCheck_ounit_test QCheck_test)
-  (libraries qcheck ounit2 qcheck-ounit))
+  (libraries ounit2 qcheck-ounit))
 
 (rule
   (targets output.txt)
   (deps ./QCheck_ounit_test.exe)
-  (package qcheck-ounit)
   (enabled_if (= %{os_type} "Unix"))
   (action
     (with-accepted-exit-codes
@@ -17,5 +16,6 @@
 
 (rule
   (alias runtest)
+  (package qcheck-ounit)
   (enabled_if (= %{os_type} "Unix"))
   (action (diff output.txt.expected output.txt)))

src/core/QCheck2.ml

@@ -1693,20 +1693,24 @@ module Test = struct
              median := i));
     (* group by buckets, if there are too many entries: *)
     (* first compute histogram and bucket size *)
+    let min_idx64, max_idx64 = Int64.(of_int min_idx, of_int max_idx) in
     let hist_size, bucket_size =
-      let sample_width = Int64.(sub (of_int max_idx) (of_int min_idx)) in
+      let sample_width = Int64.sub max_idx64 min_idx64 in
       if sample_width > Int64.of_int stat_max_lines
       then stat_max_lines,
            int_of_float (ceil (Int64.to_float sample_width /. float_of_int stat_max_lines))
       else max_idx-min_idx, 1
     in
-    let hist_size = if min_idx + bucket_size * hist_size <= max_idx then 1+hist_size else hist_size in
+    let hist_size =
+      if Int64.(add min_idx64 (mul (of_int bucket_size) (of_int hist_size))) <= max_idx64
+      then 1+hist_size
+      else hist_size in
     (* accumulate bucket counts *)
     let max_val = ref 0 in (* max value after grouping by buckets *)
     let bucket_count = Array.init hist_size (fun _ -> 0) in
     Hashtbl.iter
       (fun j count ->
-         let bucket = Int64.(to_int (div (sub (of_int j) (of_int min_idx)) (of_int bucket_size))) in
+         let bucket = Int64.(to_int (div (sub (of_int j) min_idx64) (of_int bucket_size))) in
          let new_count = bucket_count.(bucket) + count in
          bucket_count.(bucket) <- new_count;
          max_val := max !max_val new_count) tbl;
@@ -1717,9 +1721,8 @@ module Test = struct
       "  num: %d, avg: %.2f, stddev: %.2f, median %d, min %d, max %d\n"
       !num !avg stddev !median min_idx max_idx;
     let indwidth =
-      max (String.length (Printf.sprintf "%d" min_idx))
-        (max (String.length (Printf.sprintf "%d" max_idx))
-           (String.length (Printf.sprintf "%d" (min_idx + bucket_size * hist_size)))) in
+      let str_width i = String.length (Printf.sprintf "%d" i) in
+      List.map str_width [min_idx; max_idx; min_idx + bucket_size * hist_size] |> List.fold_left max min_int in
     let labwidth = if bucket_size=1 then indwidth else 2+2*indwidth in
     for i = 0 to hist_size - 1 do
       let i' = min_idx + i * bucket_size in

src/dune

@@ -3,7 +3,6 @@
   (name qcheck)
   (public_name qcheck)
   (wrapped false)
-  (optional)
   (modules QCheck_runner)
   (synopsis "compatibility library for qcheck")
   (libraries qcheck-core qcheck-core.runner qcheck-ounit))

src/ounit/dune

@@ -2,7 +2,6 @@
 (library
   (name qcheck_ounit)
   (public_name qcheck-ounit)
-  (optional)
   (wrapped false)
   (libraries unix bytes qcheck-core qcheck-core.runner ounit2)
   (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)