make check's diff -u vs -c

jw schultz jw at pegasys.ws
Sat Jul 5 23:06:19 EST 2003


Wayne, i like the diff -u idea.  I find -c awkward.

It seems to me that the shell script could test for support
of -u and if present use it instead of -c.  ala

	if [ -n "`diff -u /dev/null /dev/null 2>&1`" ]
	then
		difftype="-c"
	else
		difftype="-u"
	fi

	diff $difftype "$2"/"$f" "$3"/"$f" || failed=YES

or something of that ilk.

On Sat, Jul 05, 2003 at 12:00:48PM +0000, rsync-cvs-request at lists.samba.org wrote:
> Date: Fri,  4 Jul 2003 23:56:59 +0000 (GMT)
> From: wayned at samba.org (Wayne Davison)
> Subject: CVS update: rsync/testsuite
> To: rsync-cvs at samba.org
> Message-ID: <20030704235659.352582C051 at lists.samba.org>
> 
> 
> Date:	Fri Jul  4 23:56:59 2003
> Author:	wayned
> 
> Update of /data/cvs/rsync/testsuite
> In directory dp.samba.org:/tmp/cvs-serv24766
> 
> Modified Files:
> 	rsync.fns trimslash.test 
> Log Message:
> Changed "diff -c" to "diff -u".
> 
> 
> Revisions:
> rsync.fns		1.55 => 1.56
> 	http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/rsync.fns.diff?r1=1.55&r2=1.56
> trimslash.test		1.1 => 1.2
> 	http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/trimslash.test.diff?r1=1.1&r2=1.2
> 
> ------------------------------
> 
> Date: Sat,  5 Jul 2003 07:09:31 +0000 (GMT)
> From: wayned at samba.org (Wayne Davison)
> Subject: CVS update: rsync/testsuite
> To: rsync-cvs at samba.org
> Message-ID: <20030705070931.ACC082C0BF at lists.samba.org>
> 
> 
> Date:	Sat Jul  5 07:09:31 2003
> Author:	wayned
> 
> Update of /data/cvs/rsync/testsuite
> In directory dp.samba.org:/tmp/cvs-serv22903
> 
> Modified Files:
> 	rsync.fns trimslash.test wildmatch.test 
> Log Message:
> Changed "diff -u" back to "diff -c" (for portability).
> 
> 
> Revisions:
> rsync.fns		1.56 => 1.57
> 	http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/rsync.fns.diff?r1=1.56&r2=1.57
> trimslash.test		1.2 => 1.3
> 	http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/trimslash.test.diff?r1=1.2&r2=1.3
> wildmatch.test		1.1 => 1.2
> 	http://www.samba.org/cgi-bin/cvsweb/rsync/testsuite/wildmatch.test.diff?r1=1.1&r2=1.2
> 



More information about the rsync mailing list