diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-07-05 15:55:52 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-07-05 15:55:52 +0000 |
| commit | 45458141eadb1be19df3e242c786861528f061e6 (patch) | |
| tree | 6e5eba39a5cf6a84104979a7fa4f5b92de3820d6 /pkgs | |
| parent | 19116c7f23136f24c1fd09843991595d971971da (diff) | |
| download | nixpkgs-45458141eadb1be19df3e242c786861528f061e6.tar nixpkgs-45458141eadb1be19df3e242c786861528f061e6.tar.gz nixpkgs-45458141eadb1be19df3e242c786861528f061e6.tar.bz2 nixpkgs-45458141eadb1be19df3e242c786861528f061e6.tar.lz nixpkgs-45458141eadb1be19df3e242c786861528f061e6.tar.xz nixpkgs-45458141eadb1be19df3e242c786861528f061e6.tar.zst nixpkgs-45458141eadb1be19df3e242c786861528f061e6.zip | |
GNU Automake 1.11: Fix sloppy tests.
svn path=/nixpkgs/trunk/; revision=22481
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/automake/automake-1.11.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/automake/more-robust-silent-tests.patch | 45 |
2 files changed, 47 insertions, 0 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 e82237152c1..ca04293e345 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { # "fixed" path in generated files! dontPatchShebangs = true; + patches = [ ./more-robust-silent-tests.patch ]; + meta = { homepage = http://www.gnu.org/software/automake/; description = "GNU Automake, a GNU standard-compliant makefile generator"; diff --git a/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch b/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch new file mode 100644 index 00000000000..ca37c412ca2 --- /dev/null +++ b/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch @@ -0,0 +1,45 @@ +Make these tests more robust. Previously, they would fail if the name +of the build directory contains `mv', which can very well happen with Nix. + +--- automake-1.11.1/tests/silent.test 2009-12-08 19:02:32.000000000 +0100 ++++ automake-1.11.1/tests/silent.test 2010-07-05 13:15:20.000000000 +0200 +@@ -1,9 +1,9 @@ + #!/bin/sh +-# Copyright (C) 2009 Free Software Foundation, Inc. ++# Copyright (C) 2009, 2010 Free Software Foundation, Inc. + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2, or (at your option) + # any later version. + # + # This program is distributed in the hope that it will be useful, +@@ -65,7 +65,7 @@ $MAKE >stdout || { cat stdout; Exit 1; } + cat stdout + grep ' -c' stdout && Exit 1 + grep ' -o foo' stdout && Exit 1 +-grep mv stdout && Exit 1 ++grep '\<mv\>' stdout && Exit 1 + grep 'CC .*foo\.' stdout + grep 'CC .*bar\.' stdout + grep 'CC .*baz\.' stdout + +--- automake-1.11.1/tests/silent2.test 2009-12-08 19:02:32.000000000 +0100 ++++ automake-1.11.1/tests/silent2.test 2010-07-05 15:42:08.000000000 +0200 +@@ -1,5 +1,5 @@ + #!/bin/sh +-# Copyright (C) 2009 Free Software Foundation, Inc. ++# Copyright (C) 2009, 2010 Free Software Foundation, Inc. + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -67,7 +67,7 @@ $MAKE >stdout || { cat stdout; Exit 1; } + cat stdout + grep ' -c' stdout && Exit 1 + grep ' -o foo' stdout && Exit 1 +-grep mv stdout && Exit 1 ++grep '\<mv\>' stdout && Exit 1 + grep 'CC .*foo\.' stdout + grep 'CC .*bar\.' stdout + grep 'CC .*baz\.' stdout + |