fix/chore: 🪲 / ⚙️ benchmark is now optional and only is performed on …

…OCaml +4.07 during CI build

Signed-off-by: Marco Aurélio da Silva <marcoonroad@gmail.com>

.travis.yml

@@ -18,7 +18,7 @@ env:
     - OCAML_VERSION=4.04 POST_INSTALL_HOOK="make report"
     - OCAML_VERSION=4.05 POST_INSTALL_HOOK="make report"
     - OCAML_VERSION=4.06 POST_INSTALL_HOOK="make lint-format; make report"
-    - OCAML_VERSION=4.07 POST_INSTALL_HOOK="make lint-format; make report"
+    - OCAML_VERSION=4.07 POST_INSTALL_HOOK="make lint-format; make bench; make report"
 os:
   - linux
 # - osx

Makefile

@@ -73,11 +73,14 @@ docs: build
 	@ mv ./_build/default/_doc/_html/* ./docs/apiref/
 
 pin:
-	@ opam pin add nocoiner . -n --yes
+	@ opam pin add nocoiner . -n --yes --working-dir
+
+unpin:
+	@ opam pin remove nocoiner --yes
 
 deps:
-	@ opam install . --deps-only --yes
-	@ opam install alcotest core --yes # force such test dependences
+	@ opam install . --deps-only --yes --working-dir
+	@ opam install alcotest --yes # force such test dependences
 
 dev-deps:
 	@ opam install \
@@ -91,18 +94,18 @@ dev-deps:
 		utop \
 		core_bench \
 		--yes
-	@ opam update --yes
-	@ opam upgrade \
-		odoc \
-		ocveralls \
-		alcotest \
-		ocp-indent \
-		ocamlformat \
-		merlin \
-		bisect_ppx \
-		utop \
-		core_bench \
-		--yes
+#	@ opam update --yes
+#	@ opam upgrade \
+#		odoc \
+#		ocveralls \
+#		alcotest \
+#		ocp-indent \
+#		ocamlformat \
+#		merlin \
+#		bisect_ppx \
+#		utop \
+#		core_bench \
+#		--yes
 
 lint-format:
 	@ opam install ocamlformat --yes

nocoiner.opam

@@ -20,18 +20,17 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 
-run-test: ["dune" "runtest" "-p" name "-j" jobs]
+run-test: ["dune" "build" "@test/spec/runtest" "-p" name "-j" jobs]
 
 depends: [
   "ocaml" {>= "4.03.0"}
   "dune" {>= "1.9"}
   "cmdliner" {>= "1.0.0"}
-  "alcotest" {with-test}
-  "core_bench" {with-test}
-  "nocrypto" {>= "0.5.4-1"}
+  "alcotest" {>= "0.8.0" & with-test}
+  "nocrypto" {>= "0.5.0"}
   "scrypt-kdf" {>= "1.0.0"}
   "digestif" {>= "0.7.0"}
-  "core" {>= "v0.9.1"}
+  "core" {>= "v0.9.0"}
   "eqaf" {>= "0.5"}
-  "bisect_ppx" {>= "1.4.1"}
+  "bisect_ppx" {>= "1.4.0"}
 ]

test/bench/dune

@@ -5,4 +5,4 @@
   (run %{test} time cycles alloc gc percentage speedup samples -all-values
     -ascii -fork -no-compactions -overheads -quota 15 -stabilize-gc -width
     300 -v -display tall))
- (libraries core_bench nocoiner))
+ (libraries nocoiner.bench))

test/bench/timing.ml

@@ -1,3 +1,4 @@
+open Nocoiner_bench
 open Core_bench.Bench
 module Command = Core.Command
 

test/support/dune

@@ -0,0 +1,9 @@
+;; wrapper library just to enable optional core_bench
+;; library installation on ocaml versions >= 4.04.1
+
+(library
+ (name nocoiner_bench)
+ (optional)
+ (public_name nocoiner.bench)
+ (modules nocoiner_bench)
+ (libraries core_bench nocoiner))

test/support/nocoiner_bench.ml

@@ -0,0 +1,7 @@
+module Nocoiner = struct
+  include Nocoiner
+end
+
+module Core_bench = struct
+  include Core_bench
+end