From owner-svn-soc-all@FreeBSD.ORG  Wed Jun 20 22:03:36 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 9DCA11065670
	for <svn-soc-all@FreeBSD.org>; Wed, 20 Jun 2012 22:03:34 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Wed, 20 Jun 2012 22:03:34 +0000
Date: Wed, 20 Jun 2012 22:03:34 +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: <20120620220334.9DCA11065670@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r238032 - soc2012/jhagewood/diff
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: Wed, 20 Jun 2012 22:03:36 -0000

Author: jhagewood
Date: Wed Jun 20 22:03:34 2012
New Revision: 238032
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238032

Log:

Modified:
  soc2012/jhagewood/diff/diff-test.sh

Modified: soc2012/jhagewood/diff/diff-test.sh
==============================================================================
--- soc2012/jhagewood/diff/diff-test.sh	Wed Jun 20 21:38:16 2012	(r238031)
+++ soc2012/jhagewood/diff/diff-test.sh	Wed Jun 20 22:03:34 2012	(r238032)
@@ -16,19 +16,35 @@
 # Default diff
 diff 1.txt 2.txt >> ./test_outputs/gnu/diff.txt
 
-# Unified output
+# --unified output
 diff -u 1.txt 2.txt >> ./test_outputs/gnu/unified.txt
 diff --unified 1.txt 2.txt >> ./test_outputs/gnu/unified.txt
 
-# Context output
+# --context output
 diff -c 1.txt 2.txt >> ./test_outputs/gnu/context.txt
 diff --context	1.txt 2.txt >> ./test_outputs/gnu/context.txt
 
-# Normal format output
+# --normal format output
 diff --normal 1.txt 2.txt >> ./test_outputs/gnu/normal.txt
 diff -c --normal 1.txt 2.txt >> ./test_outputs/gnu/normal.txt
 diff -u --normal 1.txt 2.txt >> ./test_outputs/gnu/normal.txt
 
+# --brief
+diff -b 1.txt 2.txt >> ./test_outputs/gnu/diff.txt
+diff --brief 1.txt 2.txt >> ./test_outputs/gnu/diff.txt
+
+# --ed 
+diff -ed 1.txt 2.txt >> ./test_outputs/gnu/diff.txt
+diff -e 1.txt 2.txt >> ./test_outputs/gnu/diff.txt
+
+# --expand-tabs
+diff --expand-tabs 1.txt 2.txt >> ./test_outputs/gnu/diff.txt
+diff -t 1.txt 2.txt >> ./test_outputs/gnu/diff.txt
+
+# --forward-ed
+diff --forward-ed 1.txt 2.txt >> ./test_outputs/gnu/diff.txt
+diff -f 1.txt 2.txt >> ./test_outputs/gnu/diff.txt
+
 #
 # Run BSD diff with various options, direct output to a file.
 #
@@ -36,19 +52,35 @@
 # Default diff
 ./diff 1.txt 2.txt >> ./test_outputs/bsd/diff.txt
 
-# Unified output
+# --unified output
 ./diff -u 1.txt 2.txt >> ./test_outputs/bsd/unified.txt
 ./diff --unified 1.txt 2.txt >> ./test_outputs/bsd/unified.txt
 
-# Context output
+# --context output
 ./diff -c 1.txt 2.txt >> ./test_outputs/bsd/context.txt
 ./diff --context	1.txt 2.txt >> ./test_outputs/bsd/context.txt
 
-# Normal format output
+# --normal format output
 ./diff --normal 1.txt 2.txt >> ./test_outputs/bsd/normal.txt
 ./diff -c --normal 1.txt 2.txt >> ./test_outputs/bsd/normal.txt
 ./diff -u --normal 1.txt 2.txt >> ./test_outputs/bsd/normal.txt
 
+# --brief
+./diff -b 1.txt 2.txt >> ./test_outputs/bsd/diff.txt
+./diff --brief 1.txt 2.txt >> ./test_outputs/bsd/diff.txt
+
+# --ed 
+./diff -ed 1.txt 2.txt >> ./test_outputs/bsd/diff.txt
+./diff -e 1.txt 2.txt >> ./test_outputs/bsd/diff.txt
+
+# --expand-tabs
+./diff --expand-tabs 1.txt 2.txt >> ./test_outputs/bsd/diff.txt
+./diff -t 1.txt 2.txt >> ./test_outputs/bsd/diff.txt
+
+# --forward-ed
+./diff --forward-ed 1.txt 2.txt >> ./test_outputs/bsd/diff.txt
+./diff -f 1.txt 2.txt >> ./test_outputs/bsd/diff.txt
+
 #
 # Get the diff between the GNU and BSD outputs.
 #