diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-07-29 19:39:15 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-07-29 19:39:15 +0000 |
| commit | 4456c7496aea944d788174d147d4c90f2d63c228 (patch) | |
| tree | 1a32de32fd9929523f0edf49e1650cb70eeabac4 /pkgs/development | |
| parent | 6e75b20d464626e47dff9192d5d534433ad8d5b0 (diff) | |
| download | nixlib-4456c7496aea944d788174d147d4c90f2d63c228.tar nixlib-4456c7496aea944d788174d147d4c90f2d63c228.tar.gz nixlib-4456c7496aea944d788174d147d4c90f2d63c228.tar.bz2 nixlib-4456c7496aea944d788174d147d4c90f2d63c228.tar.lz nixlib-4456c7496aea944d788174d147d4c90f2d63c228.tar.xz nixlib-4456c7496aea944d788174d147d4c90f2d63c228.tar.zst nixlib-4456c7496aea944d788174d147d4c90f2d63c228.zip | |
Autoconf: Patch sloppy test case.
svn path=/nixpkgs/trunk/; revision=16511
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/misc/autoconf/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/autoconf/test-suite-fix.patch | 17 |
2 files changed, 20 insertions, 7 deletions
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index cddd5cf128c6..2203062c4385 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -8,15 +8,11 @@ stdenv.mkDerivation rec { sha256 = "11damk9x09616cjdfxx9y73igd96zzylgq0l4j57qzify6nlqbw7"; }; + patches = [ ./test-suite-fix.patch ]; + buildInputs = [ m4 perl ]; - # FIXME: The test suite fails on Darwin (see - # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6813) and on - # Cygwin (see http://hydra.nixos.org/build/53814; yet to be reported - # upstream). - doCheck = - (builtins.currentSystem != "i686-darwin") - && (builtins.currentSystem != "i686-cygwin"); + doCheck = true; # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! diff --git a/pkgs/development/tools/misc/autoconf/test-suite-fix.patch b/pkgs/development/tools/misc/autoconf/test-suite-fix.patch new file mode 100644 index 000000000000..3d5d20b85625 --- /dev/null +++ b/pkgs/development/tools/misc/autoconf/test-suite-fix.patch @@ -0,0 +1,17 @@ +This patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de> fixes +the "Hard fail" test case. + +See http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6814 +for details. + +--- a/tests/autotest.at ++++ b/tests/autotest.at +@@ -271,7 +271,7 @@ AT_CHECK_AT_TEST([Hard fail], + AT_CHECK([exit 99])], + [], [1], [], [ignore], [], + [AT_CHECK([grep '2 failed unexpectedly' micro-suite.log], [], [ignore]) +- AT_CHECK([grep ok micro-suite.log], [1])]) ++ AT_CHECK([grep '^[[12]].*ok' micro-suite.log], [1])]) + + AT_CHECK_AT_TEST([AT@&t@_FAIL_IF], + [AT_FAIL_IF([:]) |