Merge pull request #30883 from bgamari/ben-cross-no-check
Don't run tests when cross-compiling
This commit is contained in:
commit
4a3e7564b0
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||||
[ "--enable-cplusplus" ]
|
[ "--enable-cplusplus" ]
|
||||||
++ lib.optional enableLargeConfig "--enable-large-config";
|
++ lib.optional enableLargeConfig "--enable-large-config";
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
|
||||||
|
|
||||||
# Don't run the native `strip' when cross-compiling.
|
# Don't run the native `strip' when cross-compiling.
|
||||||
dontStrip = hostPlatform != buildPlatform;
|
dontStrip = hostPlatform != buildPlatform;
|
||||||
|
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
outputMan = "dev"; # tiny page for a dev tool
|
outputMan = "dev"; # tiny page for a dev tool
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
patchShebangs ./run.sh
|
patchShebangs ./run.sh
|
||||||
|
|
|
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx";
|
sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx";
|
||||||
};
|
};
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
|
||||||
|
|
||||||
# Linking static stubs on cygwin requires correct ordering.
|
# Linking static stubs on cygwin requires correct ordering.
|
||||||
# Consider upstreaming this.
|
# Consider upstreaming this.
|
||||||
|
|
|
@ -12,7 +12,8 @@ assert guileBindings -> guile != null;
|
||||||
let
|
let
|
||||||
# XXX: Gnulib's `test-select' fails on FreeBSD:
|
# XXX: Gnulib's `test-select' fails on FreeBSD:
|
||||||
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
|
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
|
||||||
doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4";
|
doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"
|
||||||
|
&& stdenv.buildPlatform == stdenv.hostPlatform;
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "gnutls-${version}";
|
name = "gnutls-${version}";
|
||||||
|
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "info" "devdoc" ];
|
outputs = [ "bin" "dev" "out" "info" "devdoc" ];
|
||||||
|
|
||||||
doCheck = ! stdenv.isDarwin;
|
doCheck = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin;
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
|
||||||
checkTarget = "test";
|
checkTarget = "test";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Library and utilities for working with the TIFF image file format";
|
description = "Library and utilities for working with the TIFF image file format";
|
||||||
|
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
# XXX: There are test failures on non-GNU systems, see
|
# XXX: There are test failures on non-GNU systems, see
|
||||||
# http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html .
|
# http://lists.gnu.org/archive/html/bug-libunistring/2010-02/msg00004.html .
|
||||||
doCheck = stdenv ? glibc;
|
doCheck = (stdenv ? glibc) && (stdenv.hostPlatform == stdenv.buildPlatform);
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://www.gnu.org/software/libunistring/;
|
homepage = http://www.gnu.org/software/libunistring/;
|
||||||
|
|
|
@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
doCheck = !stdenv.isDarwin;
|
doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin;
|
||||||
|
|
||||||
crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
|
crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
|
||||||
# creating the DLL is broken ATM
|
# creating the DLL is broken ATM
|
||||||
|
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Real-time data (de)compression library";
|
description = "Real-time data (de)compression library";
|
||||||
|
|
Loading…
Reference in a new issue