eio: move eio/src to rng/eio and eio/tests to tests

mirage · Jul 12, 2022 · 4dae18c · 4dae18c
1 parent 218193c
commit 4dae18c
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 8 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -22,7 +22,8 @@ freebsd_task:
     - opam pin add mirage-crypto-ec . -y --with-version=0.10.6 --with-test
     - opam pin add mirage-crypto-rng-async . -y --with-version=0.10.6 --with-test
 
-  test_script: opam exec -- dune runtest tests
+  test_script: opam exec -- dune runtest -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-mirage,mirage-crypto-pk,mirage-crypto-ec,mirage-crypto-rng-async
+
   test_mirage_script: eval `opam env` && ./.test-mirage.sh
 
 freebsd_eio_task:
@@ -39,4 +40,4 @@ freebsd_eio_task:
     - opam pin add mirage-crypto-rng . -y --with-version=dev
     - opam pin add mirage-crypto-rng-eio . -y --with-version=dev --with-test
 
-  test_script: opam exec -- dune runtest eio
+  test_script: opam exec -- dune runtest -p mirage-crypto-rng,mirage-crypto-rng-eio
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,10 +33,11 @@ jobs:
         run: opam exec -- dune build -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-mirage,mirage-crypto-pk,mirage-crypto-ec,mirage-crypto-rng-async
 
       - name: Test
-        run: opam exec -- dune runtest tests
+        run: opam exec -- dune runtest -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-mirage,mirage-crypto-pk,mirage-crypto-ec,mirage-crypto-rng-async
 
   build-test-unix-eio:
     name : Unix (eio)
+
     strategy:
       fail-fast: false
       matrix:
@@ -68,4 +69,4 @@ jobs:
         run: opam exec -- dune build -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-eio
 
       - name: Test
-        run: opam exec -- dune runtest eio
+        run: opam exec -- dune runtest -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-eio
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -35,3 +35,40 @@ jobs:
 
       - name: Test
         run: opam exec -- dune runtest -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-mirage,mirage-crypto-pk,mirage-crypto-ec
+
+  build-test-windows-eio:
+    name : Windows (eio)
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ocaml-version: [ocaml-variants.5.0.0+trunk]
+        operating-system: [windows-latest]
+
+    runs-on: ${{ matrix.operating-system }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Use OCaml ${{ matrix.ocaml-version }}
+        uses: ocaml/setup-ocaml@v2
+        with:
+          opam-local-packages: |
+            mirage-crypto.opam
+            mirage-crypto-rng.opam
+            mirage-crypto-rng-eio.opam
+          ocaml-compiler: ${{ matrix.ocaml-version }}
+          opam-repositories: |
+            default: https://github.com/ocaml/opam-repository.git
+            alpha: https://github.com/kit-ty-kate/opam-alpha-repository.git
+
+      - name: Install dependencies
+        run: opam install --deps-only -t mirage-crypto mirage-crypto-rng mirage-crypto-rng-eio
+
+      - name: Build
+        run: opam exec -- dune build -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-eio
+
+      - name: Test
+        run: opam exec -- dune runtest -p mirage-crypto,mirage-crypto-rng,mirage-crypto-rng-eio
+
diff --git a/eio/tests/dune b/eio/tests/dune
diff --git a/eio/src/dune → rng/eio/dune b/eio/src/dune → rng/eio/dune
diff --git a/eio/src/mirage_crypto_rng_eio.ml → rng/eio/mirage_crypto_rng_eio.ml b/eio/src/mirage_crypto_rng_eio.ml → rng/eio/mirage_crypto_rng_eio.ml
diff --git a/eio/src/mirage_crypto_rng_eio.mli → rng/eio/mirage_crypto_rng_eio.mli b/eio/src/mirage_crypto_rng_eio.mli → rng/eio/mirage_crypto_rng_eio.mli
diff --git a/tests/dune b/tests/dune
@@ -69,3 +69,9 @@
  (libraries alcotest mirage-crypto-ec wycheproof asn1-combinators
    mirage-crypto-pk mirage-crypto)
  (package mirage-crypto-ec))
+
+(tests
+ (names     test_eio_rng test_eio_entropy_collection)
+ (modules   test_eio_rng test_eio_entropy_collection)
+ (libraries mirage-crypto-rng-eio duration eio_main)
+ (package   mirage-crypto-rng-eio))
diff --git a/eio/tests/test_entropy_collection.ml → tests/test_eio_entropy_collection.ml b/eio/tests/test_entropy_collection.ml → tests/test_eio_entropy_collection.ml
diff --git a/eio/tests/test_eio_rng.ml → tests/test_eio_rng.ml b/eio/tests/test_eio_rng.ml → tests/test_eio_rng.ml