From 61817876fc703e1e4ffad74fb3a8c755ef3c3c8f Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 15 Aug 2012 10:13:02 +0200 Subject: [PATCH] Revert "automake: Disabling tests on mips." Causes infinite recursion on all other platforms. This reverts commit eadcd7dab64aa2cabd7fdf0a4be90cc6fdf5b168. --- pkgs/development/tools/misc/automake/automake-1.11.x.nix | 3 +-- pkgs/development/tools/misc/automake/automake-1.12.x.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 1e93593d7943..7c9d06baa543 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [perl autoconf makeWrapper]; - # Bug in a test in automake. Upstream git already fixed it removing the test. - doCheck = if stdenv.isMips then false else doCheck; + inherit doCheck; # Disable indented log output from Make, otherwise "make.test" will # fail. diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 66d43974f6e4..e2db84d2fc34 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { sed -i -e 's|t/aclocal7.sh||' Makefile.in ''; - # Bug in a test in automake. Upstream git already fixed it removing the test. - doCheck = if stdenv.isMips then false else doCheck; + inherit doCheck; # The test suite can run in parallel. enableParallelBuilding = true;