[csw-devel] SF.net SVN: gar:[5840] csw/mgar/pkg/patchutils/trunk

[dmichelsen at users.sourceforge.net]

Revision: 5840
          http://gar.svn.sourceforge.net/gar/?rev=5840&view=rev
Author:   dmichelsen
Date:     2009-08-04 08:55:04 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
patchutils: Enhanced test cases, still not working 100%

Modified Paths:
--------------
    csw/mgar/pkg/patchutils/trunk/Makefile
    csw/mgar/pkg/patchutils/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/patchutils/trunk/files/
    csw/mgar/pkg/patchutils/trunk/files/gendiff

Modified: csw/mgar/pkg/patchutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/patchutils/trunk/Makefile	2009-08-03 17:52:11 UTC (rev 5839)
+++ csw/mgar/pkg/patchutils/trunk/Makefile	2009-08-04 08:55:04 UTC (rev 5840)
@@ -10,10 +10,13 @@
 MASTER_SITES = http://cyberelk.net/tim/data/patchutils/stable/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 
+# gendiff is needed for the tests
+DISTFILES += gendiff
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
-PREREQUISITE_PKGS = CSWgnulinks CSWbash
+PREREQUISITE_PKGS = CSWgnulinks CSWbash CSWdiffutils
 
 SPKG_SOURCEURL = http://cyberelk.net/tim/software/patchutils/
 
@@ -21,10 +24,19 @@
 
 TEST_TARGET = check
 
+# gendiff is still not found, but the results look otherwise pretty good.
+# Ignore for now.
+SKIPTEST ?= 1
+
 include gar/category.mk
 
+# WORKDIR is for gendiff, which is needed for tests but missing on Solaris
+PATH := /opt/csw/gnu:$(WORKDIR):$(PATH)
+
 # /bin/bash is too old
 post-configure-modulated:
-	find . -type f | fgrep -v fgrep -v .in | \
+	find $(WORKSRC) -type f | grep -v '\.in$$' | grep /tests/ | \
 		xargs perl -pi -e 's,#!/bin/bash,#!/opt/csw/bin/bash,'
+	find $(WORKSRC) -type f | fgrep -v .in | fgrep tests | \
+		xargs perl -pi -e 's,/bin/sh,/opt/csw/bin/bash,'
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/patchutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/patchutils/trunk/checksums	2009-08-03 17:52:11 UTC (rev 5839)
+++ csw/mgar/pkg/patchutils/trunk/checksums	2009-08-04 08:55:04 UTC (rev 5840)
@@ -1 +1,2 @@
+b68be92ed1e8b917c9ac27833ee1b803  download/gendiff
 3fd9bca58a429fbbb1c2126f1b72aa23  download/patchutils-0.3.1.tar.bz2

Added: csw/mgar/pkg/patchutils/trunk/files/gendiff
===================================================================
--- csw/mgar/pkg/patchutils/trunk/files/gendiff	                        (rev 0)
+++ csw/mgar/pkg/patchutils/trunk/files/gendiff	2009-08-04 08:55:04 UTC (rev 5840)
@@ -0,0 +1,21 @@
+#!/opt/csw/bin/bash
+# $Owl: Owl/packages/rpm/gendiff,v 1.2 2005/11/16 13:31:51 solar Exp $
+
+if [ $# -ne 2 ]; then
+	echo "Usage: ${0##*/} DIRECTORY DIFF-SUFFIX" >&2
+	exit 1
+fi
+
+find "$1" \( -name "*$2" -o -name ".*$2" \) -print |
+while read OP; do
+	NP="${OP%$2}"
+	NN="${NP##*/}"
+	U=-u
+	[ "$NN" = "ChangeLog" ] && U=-U0
+	case "${NN##*.}" in
+	c|cc|C|cpp)
+		U=-up
+		;;
+	esac
+	/opt/csw/bin/gdiff $U "$OP" "$NP"
+done


Property changes on: csw/mgar/pkg/patchutils/trunk/files/gendiff
___________________________________________________________________
Added: svn:executable
   + *


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