Author: ludo Date: 2010-07-05 15:55:52 +0000 (Mon, 05 Jul 2010) New Revision: 22481
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22481&view=rev Added: nixpkgs/trunk/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch Modified: nixpkgs/trunk/pkgs/development/tools/misc/automake/automake-1.11.x.nix Log: GNU Automake 1.11: Fix sloppy tests. Changes: Modified: nixpkgs/trunk/pkgs/development/tools/misc/automake/automake-1.11.x.nix =================================================================== --- nixpkgs/trunk/pkgs/development/tools/misc/automake/automake-1.11.x.nix 2010-07-05 14:34:08 UTC (rev 22480) +++ nixpkgs/trunk/pkgs/development/tools/misc/automake/automake-1.11.x.nix 2010-07-05 15:55:52 UTC (rev 22481) @@ -24,6 +24,8 @@ # "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"; Added: nixpkgs/trunk/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch =================================================================== --- nixpkgs/trunk/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch (rev 0) +++ nixpkgs/trunk/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch 2010-07-05 15:55:52 UTC (rev 22481) @@ -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 + _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
