Revision: 13885
http://gar.svn.sourceforge.net/gar/?rev=13885&view=rev
Author: bdwalton
Date: 2011-03-21 00:02:21 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
git/trunk: patch the test suite to work around broken solaris ln
Modified Paths:
--------------
csw/mgar/pkg/git/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch
Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile 2011-03-20 21:54:16 UTC (rev 13884)
+++ csw/mgar/pkg/git/trunk/Makefile 2011-03-21 00:02:21 UTC (rev 13885)
@@ -10,7 +10,7 @@
# detected as the first available utf8 locale. the failure is
# harmless though.
-TEST_SCRIPTS =
+#TEST_SCRIPTS =
PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs
PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev
@@ -99,6 +99,7 @@
PATCHFILES += 0003-Update-path-in-sample-hook-file.patch
PATCHFILES += 0004-Use-bash-and-set-PATH-in-contributed-hook-file.patch
PATCHFILES += 0005-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
+PATCHFILES += 0006-work-around-solaris-ln-bug.patch
fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
define _git_files
Added: csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch
(rev 0)
+++ csw/mgar/pkg/git/trunk/files/0006-work-around-solaris-ln-bug.patch
2011-03-21 00:02:21 UTC (rev 13885)
@@ -0,0 +1,34 @@
+From afe25b62999a24a7585dcf8008eb180f585ba158 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwal...@opencsw.org>
+Date: Sun, 20 Mar 2011 03:38:32 +0100
+Subject: [PATCH] work around solaris ln bug
+
+Signed-off-by: Ben Walton <bwal...@opencsw.org>
+---
+ t/t8006-blame-textconv.sh | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh
+index ea64cd8..83f7c99 100755
+--- a/t/t8006-blame-textconv.sh
++++ b/t/t8006-blame-textconv.sh
+@@ -18,14 +18,14 @@ test_expect_success 'setup ' '
+ echo "bin: test 1" >one.bin &&
+ echo "bin: test number 2" >two.bin &&
+ if test_have_prereq SYMLINKS; then
+- ln -s one.bin symlink.bin
++ /opt/csw/gnu/ln -s one.bin symlink.bin
+ fi &&
+ git add . &&
+ GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01
18:00:00" &&
+ echo "bin: test 1 version 2" >one.bin &&
+ echo "bin: test number 2 version 2" >>two.bin &&
+ if test_have_prereq SYMLINKS; then
+- ln -sf two.bin symlink.bin
++ /opt/csw/gnu/ln -sf two.bin symlink.bin
+ fi &&
+ GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01
20:00:00"
+ '
+--
+1.7.3.2
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
