diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 637c19820339130d5b6a3b04f47fc8b16bc8387e..a6f3b5764badb5876ea558beba4350ea082a4758 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,12 +70,6 @@ test: - nix --extra-experimental-features "nix-command flakes" build - nix --extra-experimental-features "nix-command flakes" flake check -L -test-lib: - stage: test - script: - - nix --extra-experimental-features "nix-command flakes" build - - nix --extra-experimental-features "nix-command flakes" develop --command make test-lib - ## Manual generation of the documentation documentation: diff --git a/Makefile b/Makefile index 5efdb4fd6d2596e4efe76a6de25a942ec9b764c6..6b365c0352163c751bac30f5dd03995bdb462a66 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ test-ci: dune build -j2 @tests/ci test-lib: - dune runtest lib + dune runtest -j2 lib promote: dune promote --root=. diff --git a/flake.nix b/flake.nix index c2ad91a340179952044ebc179f9041a330e07ad8..a3f4e64692f3a062d6ad59ae4eac72ec41c45766 100644 --- a/flake.nix +++ b/flake.nix @@ -99,11 +99,22 @@ dontInstall = true; doCheck = true; checkPhase = '' - make test make test-ci + make test-lib ''; buildInputs = oldAttrs.buildInputs ++ - [ pkgs.python3Packages.onnx pkgs.python3Packages.scikit-learn ]; + [ + pkgs.python3 + pkgs.python3Packages.onnx + pkgs.python3Packages.scikit-learn + ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ + [ + pkgs.python3 + pkgs.python3Packages.onnx + pkgs.python3Packages.scikit-learn + ]; + }); }; apps = rec { diff --git a/lib/ovo/tests/linear.ml b/lib/ovo/tests/linear.ml index 8c3bab6496f2c914d720561653592bdcf4d4adb5..3c58eee90e581131e348aeb7f7f19219c5655db0 100644 --- a/lib/ovo/tests/linear.ml +++ b/lib/ovo/tests/linear.ml @@ -39,7 +39,7 @@ let test_filename = dir ^ "/tests" (* 1 *) let () = let pid = - Unix.create_process "/usr/bin/python3" + Unix.create_process "python3" [| "python3"; "../../../tests/bin/gen_linear_ovo.py"; @@ -61,7 +61,7 @@ let () = (* 3 *) let () = let pid = - Unix.create_process "/usr/bin/python3" + Unix.create_process "python3" [| "python3"; "../../../tests/bin/check_onnx.py";