travis/compat

Author: pqwy

.travis.yml

@@ -7,18 +7,14 @@ env:
     - UPDATE_GCC_BINUTILS=1
   matrix:
     - OCAML_VERSION=4.02
-    - OCAML_VERSION=4.02 DEPOPTS="lwt cstruct-lwt"
     - OCAML_VERSION=4.03
-    - OCAML_VERSION=4.03 DEPOPTS="lwt cstruct-lwt"
-    - OCAML_VERSION=4.03 DEPOPTS="mirage-entropy"
     - OCAML_VERSION=4.04
-    - OCAML_VERSION=4.04 DEPOPTS="lwt cstruct-lwt"
-    - OCAML_VERSION=4.04 DEPOPTS="mirage-xen"
     - OCAML_VERSION=4.05
     - OCAML_VERSION=4.05 DEPOPTS="lwt cstruct-lwt"
-    - OCAML_VERSION=4.05 DEPOPTS="mirage-solo5 mirage-entropy"
-    - OCAML_VERSION=4.06
+    - OCAML_VERSION=4.06 TESTS=true
+    - OCAML_VERSION=4.06 TESTS=true NOCRYPTO_ACCELERATE="false"
     - OCAML_VERSION=4.06 DEPOPTS="lwt cstruct-lwt"
+    - OCAML_VERSION=4.04 DEPOPTS="mirage-xen"
     - OCAML_VERSION=4.06 DEPOPTS="mirage-solo5 mirage-entropy"
 notifications:
   email: false

_tags

@@ -17,10 +17,10 @@ true: package(bytes cstruct)
 <mirage>: include
 <mirage/*.ml{,i}>: package(lwt mirage-entropy)
 
-<**/*.c>: ccopt(--std=c99 -Wall -Wextra -O3)
+<**/*.c>: ccopt(-D_DEFAULT_SOURCE --std=c99 -Wall -Wextra -O3)
 <**/aes_aesni.c>: ccopt(-Wno-implicit-fallthrough)
 
-<bench/*>: use_nocrypto, package(zarith cstruct.unix)
+<bench/*>: use_nocrypto, package(zarith)
 <tests/*>: use_nocrypto, package(zarith oUnit)
 
 <rondom>: -traverse

opam

@@ -9,11 +9,18 @@ license:      "ISC"
 tags:          [ "org:mirage" ]
 available:     [ ocaml-version >= "4.02.0" ]
 
-build: ["ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "false"
-                "--with-lwt" "%{lwt+cstruct-lwt:installed}%"
-                "--xen" "%{mirage-xen:installed}%"
-                "--mirage" "%{mirage-entropy+lwt:installed}%"
-                "--freestanding" "%{mirage-solo5:installed}%"]
+build: [
+  [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%"
+            "--tests" "false"
+            "--with-lwt" "%{lwt+cstruct-lwt:installed}%"
+            "--xen" "%{mirage-xen:installed}%"
+            "--mirage" "%{mirage-entropy+lwt:installed}%"
+            "--freestanding" "%{mirage-solo5:installed}%" ]
+  [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%"
+    "--tests" "true" ] {test}
+]
+run-test: ["ocaml" "pkg/pkg.ml" "test" ]
+
 
 depends: [
   "ocamlfind" {build}

src/native/nocrypto.h

@@ -2,13 +2,12 @@
 #define H__NOCRYPTO
 
 #include <stdint.h>
-#define __USE_MISC
-
 #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/endian.h>
 #elif defined(__APPLE__)
 #include <machine/endian.h>
 #else
+// Needs _DEFAULT_SOURCE on Linux.
 #include <endian.h>
 #endif