From owner-svn-soc-all@FreeBSD.ORG  Wed Jun 20 22:17:08 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 EC407106566B
	for <svn-soc-all@FreeBSD.org>; Wed, 20 Jun 2012 22:17:05 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Wed, 20 Jun 2012 22:17:05 +0000
Date: Wed, 20 Jun 2012 22:17:05 +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: <20120620221705.EC407106566B@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r238033 - 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:17:08 -0000

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

Log:

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

Modified: soc2012/jhagewood/diff/diff-test.sh
==============================================================================
--- soc2012/jhagewood/diff/diff-test.sh	Wed Jun 20 22:03:34 2012	(r238032)
+++ soc2012/jhagewood/diff/diff-test.sh	Wed Jun 20 22:17:05 2012	(r238033)
@@ -30,20 +30,23 @@
 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
+diff -b 1.txt 2.txt >> ./test_outputs/gnu/brief.txt
+diff --brief 1.txt 2.txt >> ./test_outputs/gnu/brief.txt
 
 # --ed 
-diff -ed 1.txt 2.txt >> ./test_outputs/gnu/diff.txt
-diff -e 1.txt 2.txt >> ./test_outputs/gnu/diff.txt
+diff -ed 1.txt 2.txt >> ./test_outputs/gnu/ed.txt
+diff -e 1.txt 2.txt >> ./test_outputs/gnu/ed.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
+diff --expand-tabs 1.txt 2.txt >> ./test_outputs/gnu/expand-tabs.txt
+diff -t 1.txt 2.txt >> ./test_outputs/gnu/expand-tabs.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
+diff --forward-ed 1.txt 2.txt >> ./test_outputs/gnu/forward-ed.txt
+diff -f 1.txt 2.txt >> ./test_outputs/gnu/forward-ed.txt
+
+# --help
+diff --help 1.txt 2.txt >> ./test_outputs/gnu/help.txt
 
 #
 # Run BSD diff with various options, direct output to a file.
@@ -66,21 +69,23 @@
 ./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
+./diff -b 1.txt 2.txt >> ./test_outputs/bsd/brief.txt
+./diff --brief 1.txt 2.txt >> ./test_outputs/bsd/brief.txt
 
 # --ed 
-./diff -ed 1.txt 2.txt >> ./test_outputs/bsd/diff.txt
-./diff -e 1.txt 2.txt >> ./test_outputs/bsd/diff.txt
+./diff -ed 1.txt 2.txt >> ./test_outputs/bsd/ed.txt
+./diff -e 1.txt 2.txt >> ./test_outputs/bsd/ed.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
+./diff --expand-tabs 1.txt 2.txt >> ./test_outputs/bsd/expand-tabs.txt
+./diff -t 1.txt 2.txt >> ./test_outputs/bsd/expand-tabs.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
+./diff --forward-ed 1.txt 2.txt >> ./test_outputs/bsd/foward-ed.txt
+./diff -f 1.txt 2.txt >> ./test_outputs/bsd/forward-ed.txt
 
+# --help
+diff --help 1.txt 2.txt >> ./test_outputs/bsd/help.txt
 #
 # Get the diff between the GNU and BSD outputs.
 #