[csw-devel] SF.net SVN: gar:[17639] csw/mgar/pkg/git/trunk

[bdwalton at users.sourceforge.net]

Revision: 17639
          http://gar.svn.sourceforge.net/gar/?rev=17639&view=rev
Author:   bdwalton
Date:     2012-04-10 00:32:23 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
git/trunk: work around broken xpg4/grep as used in the test suite

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2012-04-10 00:31:26 UTC (rev 17638)
+++ csw/mgar/pkg/git/trunk/Makefile	2012-04-10 00:32:23 UTC (rev 17639)
@@ -118,6 +118,7 @@
 PATCHFILES += 0008-run-command.c-Define-SHELL_PATH-macro-for-use-in-pre.patch
 PATCHFILES += 0009-Makefile-Set-EXTRA_CPPFLAGS-during-the-compilation-o.patch
 PATCHFILES += 0009-Avoid-bug-in-Solaris-xpg4-sed-as-used-in-submodule.patch
+PATCHFILES += 0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Added: csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0010-Avoid-problem-with-xpg4-grep-in-Solaris-that-broke-t.patch	2012-04-10 00:32:23 UTC (rev 17639)
@@ -0,0 +1,36 @@
+From 7b0ec3913cca1607e6777ef527c39773c908ed4d Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at artsci.utoronto.ca>
+Date: Mon, 9 Apr 2012 03:43:40 +0200
+Subject: [PATCH] Avoid problem with xpg4 grep in Solaris that broke t9400
+
+The grep in Solaris' /usr/xpg4/bin as found by the default
+SANE_TOOL_PATH was not properly handling the 'cvs co -c (shows module
+database)' test.  The [\t ] character set selection does not properly
+trigger so the first grep in the test fails.
+
+Instead of working around this issue, switch to using the standard
+test_cmp() shell function to perform the comparison instead.
+
+Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
+---
+ t/t9400-git-cvsserver-server.sh |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
+index 9199550..df1405f 100755
+--- a/t/t9400-git-cvsserver-server.sh
++++ b/t/t9400-git-cvsserver-server.sh
+@@ -500,8 +500,8 @@ test_expect_success 'cvs status (no subdirs in header)' '
+ cd "$WORKDIR"
+ test_expect_success 'cvs co -c (shows module database)' '
+     GIT_CONFIG="$git_config" cvs co -c > out &&
+-    grep "^master[	 ]\+master$" < out &&
+-    ! grep -v "^master[	 ]\+master$" < out
++    echo "master	master" > out.expected &&
++    test_cmp out out.expected
+ '
+ 
+ #------------
+-- 
+1.7.9
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.