Merge pull request #50527 from matthewbauer/ninja-check-phase

Add check phase to ninja setup hook
2018-11-20 16:55:12 -06:00
parent 284eca792f 70e2b0bef0
commit d492f53faf
26 changed files with 59 additions and 88 deletions
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -30,10 +30,6 @@ stdenv.mkDerivation rec {

  doCheck = ! shared;

-  checkPhase = "
-    ctest
-  ";
-
  enableParallelBuilding = true;

  meta = with stdenv.lib; {
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
      )
  '';

-  checkPhase = ''
+  preCheck = ''
    # make sure the test starts even if we have less than 4 cores
    export OMPI_MCA_rmaps_base_oversubscribe=1

@@ -35,9 +35,6 @@ stdenv.mkDerivation rec {
    export OMP_NUM_THREADS=1

    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib
-    export CTEST_OUTPUT_ON_FAILURE=1
-
-    make test
  '';

  meta = with stdenv.lib; {