From owner-svn-soc-all@FreeBSD.ORG  Mon Jul  2 15:26:14 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id A6C1E1065670
	for <svn-soc-all@FreeBSD.org>; Mon,  2 Jul 2012 15:26:12 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Mon, 02 Jul 2012 15:26:12 +0000
Date: Mon, 02 Jul 2012 15:26:12 +0000
From: jhagewood@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120702152612.A6C1E1065670@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r238812 - soc2012/jhagewood/sdiff
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jul 2012 15:26:14 -0000

Author: jhagewood
Date: Mon Jul  2 15:26:12 2012
New Revision: 238812
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238812

Log:

Modified:
  soc2012/jhagewood/sdiff/TODO
  soc2012/jhagewood/sdiff/sdiff-test.sh

Modified: soc2012/jhagewood/sdiff/TODO
==============================================================================
--- soc2012/jhagewood/sdiff/TODO	Mon Jul  2 15:23:00 2012	(r238811)
+++ soc2012/jhagewood/sdiff/TODO	Mon Jul  2 15:26:12 2012	(r238812)
@@ -1,2 +1,2 @@
 Combine diff-spec args and pipe to diff 	INCOMPLETE
-Test script					IN PROGRESS
+Test script					COMPLETE

Modified: soc2012/jhagewood/sdiff/sdiff-test.sh
==============================================================================
--- soc2012/jhagewood/sdiff/sdiff-test.sh	Mon Jul  2 15:23:00 2012	(r238811)
+++ soc2012/jhagewood/sdiff/sdiff-test.sh	Mon Jul  2 15:26:12 2012	(r238812)
@@ -56,6 +56,25 @@
 	
 	# --tabsize
 	$1 --tabsize="6" 1.txt 2.txt >> $2/tabsize.txt
+	
+	# --minimal
+	$1 -d 1.txt 2.txt >> $2/minimal.txt
+	$1 --minimal 1.txt 2.txt >> $2/minimal.txt
+	
+	# --speed-large-files
+	$1 -H 1.txt 2.txt >> $2/speedlrgfiles.txt
+	$1 --speed-large-files 1.txt 2.txt >> $2/speedlrgfiles.txt
+	
+	# --diff-program
+	$1 --diff-program="usr/bin/diff" 1.txt 2.txt >> $2/diffprog.txt
+	
+	# --output
+	$1 -o $2/output.txt 1.txt 2.txt 
+	$1 --output=$2/output.txt 1.txt 2.txt 
+
+	# --ignore-matching-lines
+	$1 -I "test" 1.txt 2.txt >> $2/ignrmatchinglines.txt
+	$1 --ignore-matching-lines="test" 1.txt 2.txt >> $2/ignrmatchinglines.txt
 }
 
 DIR_PATH="./test_outputs/gnu"