summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-11-19 16:16:16 -0600
committerMatthew Bauer <mjbauer95@gmail.com>2018-11-19 16:16:16 -0600
commit285eb9a8949a63446fd8bdffbe30a8468ed897c7 (patch)
tree9875af241efe3dc688549b4997b928fb8c325bcc /pkgs/development/libraries
parentb75d5adb330bf013fdbc9ff2514fad49a6ca3dc1 (diff)
downloadnixpkgs-285eb9a8949a63446fd8bdffbe30a8468ed897c7.tar
nixpkgs-285eb9a8949a63446fd8bdffbe30a8468ed897c7.tar.gz
nixpkgs-285eb9a8949a63446fd8bdffbe30a8468ed897c7.tar.bz2
nixpkgs-285eb9a8949a63446fd8bdffbe30a8468ed897c7.tar.lz
nixpkgs-285eb9a8949a63446fd8bdffbe30a8468ed897c7.tar.xz
nixpkgs-285eb9a8949a63446fd8bdffbe30a8468ed897c7.tar.zst
nixpkgs-285eb9a8949a63446fd8bdffbe30a8468ed897c7.zip
cmake: set CTEST_OUTPUT_ON_FAILURE globally
We should always use this.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/cmark/default.nix1
-rw-r--r--pkgs/development/libraries/science/math/scalapack/default.nix5
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index 1cf963c8946..a7b604bc0d2 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
   doCheck = !stdenv.isDarwin;
   preCheck = ''
     export LD_LIBRARY_PATH=$(readlink -f ./src)
-    export CTEST_OUTPUT_ON_FAILURE=1
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index 3961374a9b1..ba02b16383f 100644
--- 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; {