Merge pull request #414 from c-cube/wip-testlib

custom testlibrary, remove qtest

Author: c-cube

.github/workflows/compat.yml

@@ -6,8 +6,6 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
 
 jobs:
   run:

.github/workflows/main.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
 
 jobs:
   run:

.ocamlformat

@@ -0,0 +1,14 @@
+version = 0.20.1
+profile=conventional
+margin=80
+if-then-else=k-r
+parens-ite=true
+parens-tuple=multi-line-only
+sequence-style=terminator
+type-decl=compact
+break-cases=toplevel
+cases-exp-indent=2
+field-space=tight-decl
+leading-nested-match-parens=true
+module-item-spacing=compact
+quiet=true

README.md

@@ -266,10 +266,10 @@ You need dune (formerly jbuilder).
 $ make
 ```
 
-To build and run tests (requires `oUnit`, [qtest](https://github.com/vincent-hugot/qtest), `gen`, `iter`):
+To build and run tests (requires `qcheck-core`, `gen`, `iter`):
 
 ```
-$ opam install oUnit qtest
+$ opam install qcheck-core
 $ make test
 ```
 
@@ -302,7 +302,7 @@ to list authors based on the git commits.
 Assuming your are in a clone of the repository:
 
 1. Some dependencies are required, you'll need
-  `opam install benchmark qcheck qtest iter gen mdx uutf`.
+  `opam install benchmark qcheck-core iter gen mdx uutf`.
 2. run `make all` to enable everything (including tests).
 3. make your changes, commit, push, and open a PR.
 4. use `make test` without moderation! It must pass before a PR
@@ -318,7 +318,7 @@ A few guidelines to follow the philosophy of containers:
 
 - no dependencies between basic modules (even just for signatures);
 - add `@since` tags for new functions;
-- add tests if possible (using [qtest](https://github.com/vincent-hugot/qtest/)).
+- add tests if possible (see `tests/` dir)
   There are numerous inline tests already,
   to see what it looks like search for comments starting with `(*$`
   in source files.

benchs/dune

@@ -1,9 +1,8 @@
- (executables
-  (names run_benchs run_bench_hash run_objsize)
-  (libraries containers containers-data
-             containers-thread benchmark gen iter qcheck oseq
-             batteries base sek)
-  (flags :standard -warn-error -3-5 -safe-string -color always -open CCShims_)
-  (optional)
-  (ocamlopt_flags :standard -O3 -color always
-                   -unbox-closures -unbox-closures-factor 20))
+(executables
+ (names run_benchs run_bench_hash run_objsize)
+ (libraries containers containers-data containers-thread benchmark gen iter
+   qcheck oseq batteries base sek)
+ (flags :standard -warn-error -3-5 -safe-string -color always -open CCShims_)
+ (optional)
+ (ocamlopt_flags :standard -O3 -color always -unbox-closures
+   -unbox-closures-factor 20))

benchs/objsize.ml

@@ -22,50 +22,52 @@ open Obj
 (*s Pointers already visited are stored in a hash-table, where
     comparisons are done using physical equality. *)
 
-module H = Hashtbl.Make(
-  struct
-    type t = Obj.t
-    let equal = (==)
-    let hash o = Hashtbl.hash (magic o : int)
-  end)
+module H = Hashtbl.Make (struct
+  type t = Obj.t
+
+  let equal = ( == )
+  let hash o = Hashtbl.hash (magic o : int)
+end)
 
 let node_table = (H.create 257 : unit H.t)
 
-let in_table o = try H.find node_table o; true with Not_found -> false
+let in_table o =
+  try
+    H.find node_table o;
+    true
+  with Not_found -> false
 
 let add_in_table o = H.add node_table o ()
-
 let reset_table () = H.clear node_table
 
 (*s Objects are traversed recursively, as soon as their tags are less than
     [no_scan_tag]. [count] records the numbers of words already visited. *)
 
 let size_of_double = size (repr 1.0)
-
 let count = ref 0
 
 let rec traverse t =
-  if not (in_table t) then begin
+  if not (in_table t) then (
     add_in_table t;
-    if is_block t then begin
+    if is_block t then (
       let n = size t in
       let tag = tag t in
-      if tag < no_scan_tag then begin
-	count := !count + 1 + n;
-	for i = 0 to n - 1 do
-      	  let f = field t i in
-	  if is_block f then traverse f
-	done
-      end else if tag = string_tag then
-	count := !count + 1 + n
+      if tag < no_scan_tag then (
+        count := !count + 1 + n;
+        for i = 0 to n - 1 do
+          let f = field t i in
+          if is_block f then traverse f
+        done
+      ) else if tag = string_tag then
+        count := !count + 1 + n
       else if tag = double_tag then
-	count := !count + size_of_double
+        count := !count + size_of_double
       else if tag = double_array_tag then
-	count := !count + 1 + size_of_double * n
+        count := !count + 1 + (size_of_double * n)
       else
-	incr count
-    end
-  end
+        incr count
+    )
+  )
 
 (*s Sizes of objects in words and in bytes. The size in bytes is computed
     system-independently according to [Sys.word_size]. *)
@@ -76,8 +78,5 @@ let size_w o =
   traverse (repr o);
   !count
 
-let size_b o = (size_w o) * (Sys.word_size / 8)
-
-let size_kb o = (size_w o) / (8192 / Sys.word_size)
-
-
+let size_b o = size_w o * (Sys.word_size / 8)
+let size_kb o = size_w o / (8192 / Sys.word_size)