Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Jun 2012 22:03:34 +0000
From:      jhagewood@FreeBSD.org
To:        svn-soc-all@FreeBSD.org
Subject:   socsvn commit: r238032 - soc2012/jhagewood/diff
Message-ID:  <20120620220334.9DCA11065670@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help
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.
 #



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120620220334.9DCA11065670>