[Groff-commit] groff/contrib/gdiffmk ChangeLog tests/runtests....

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     06/09/13 19:43:12

Modified files:
        contrib/gdiffmk: ChangeLog 
        contrib/gdiffmk/tests: runtests.in 
Added files:
        contrib/gdiffmk/tests: baseline baseline.10 baseline.6 
                               baseline.7 baseline.8 baseline.9 
Removed files:
        contrib/gdiffmk/tests: test_baseline test_baseline10 
                               test_baseline6 test_baseline7 
                               test_baseline8 test_baseline9 

Log message:
        * tests/test_baseline*: Renamed to...
        * tests/baseline.*: This.
        
        * tests/runtests.in: Updated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/ChangeLog?cvsroot=groff&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/runtests.in?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/baseline?cvsroot=groff&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/baseline.10?cvsroot=groff&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/baseline.6?cvsroot=groff&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/baseline.7?cvsroot=groff&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/baseline.8?cvsroot=groff&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/baseline.9?cvsroot=groff&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/test_baseline?cvsroot=groff&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/test_baseline10?cvsroot=groff&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/test_baseline6?cvsroot=groff&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/test_baseline7?cvsroot=groff&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/test_baseline8?cvsroot=groff&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/gdiffmk/tests/test_baseline9?cvsroot=groff&r1=1.1&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/gdiffmk/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ChangeLog   16 Jan 2005 23:08:26 -0000      1.10
+++ ChangeLog   13 Sep 2006 19:43:12 -0000      1.11
@@ -1,3 +1,10 @@
+2006-09-13  Werner LEMBERG  <address@hidden>
+
+       * tests/test_baseline*: Renamed to...
+       * tests/baseline.*: This.
+
+       * tests/runtests.in: Updated.
+
 2005-01-16  Mike Bianchi  <address@hidden>
 
        * gdiffmk.sh (Usage): Fix typos.

Index: tests/runtests.in
===================================================================
RCS file: /cvsroot/groff/groff/contrib/gdiffmk/tests/runtests.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tests/runtests.in   18 May 2005 07:03:06 -0000      1.5
+++ tests/runtests.in   13 Sep 2006 19:43:12 -0000      1.6
@@ -8,7 +8,7 @@
 #      Test the number of arguments and the first argument.
 case $#-$1 in
 1-clean )
-       rm -fv test_result* tmp_file*
+       rm -fv result* tmp_file*
        exit 0
        ;;
 1-run )
@@ -17,7 +17,7 @@
        echo >&2 "$0 [ clean | run ]
 Run a few simple tests on \`${command}'."'
 
-clean  Remove the test_result? and tmp_file? files.
+clean  Remove the result? and tmp_file? files.
 run    Run the tests.
 '
        exit 255
@@ -42,57 +42,57 @@
 #      Run tests.
 
 #      3 file arguments
-ResultFile=test_result1
+ResultFile=result.1
 ${command}  ${srcdir}/file1  ${srcdir}/file2 ${ResultFile} 2>${tmpfile}
 cat ${tmpfile} >>${ResultFile}
-TestResult ${srcdir}/test_baseline ${ResultFile}
+TestResult ${srcdir}/baseline ${ResultFile}
 
 #      OUTPUT to stdout by default
-ResultFile=test_result2
+ResultFile=result.2
 ${command}  ${srcdir}/file1  ${srcdir}/file2  >${ResultFile} 2>&1
-TestResult ${srcdir}/test_baseline ${ResultFile}
+TestResult ${srcdir}/baseline ${ResultFile}
 
 #      OUTPUT to stdout via  -  argument
-ResultFile=test_result3
+ResultFile=result.3
 ${command}  ${srcdir}/file1  ${srcdir}/file2 - >${ResultFile} 2>&1
-TestResult ${srcdir}/test_baseline ${ResultFile}
+TestResult ${srcdir}/baseline ${ResultFile}
 
 #      FILE1 from standard input via  -  argument
-ResultFile=test_result4
+ResultFile=result.4
 ${command}  - ${srcdir}/file2 <${srcdir}/file1  >${ResultFile} 2>&1
-TestResult ${srcdir}/test_baseline ${ResultFile}
+TestResult ${srcdir}/baseline ${ResultFile}
 
 #      FILE2 from standard input via  -  argument
-ResultFile=test_result5
+ResultFile=result.5
 ${command}  ${srcdir}/file1 - <${srcdir}/file2  >${ResultFile} 2>&1
-TestResult ${srcdir}/test_baseline ${ResultFile}
+TestResult ${srcdir}/baseline ${ResultFile}
 
 #      Different values for addmark, changemark, deletemark
-ResultFile=test_result6
+ResultFile=result.6
 ${command}  -aA -cC -dD  ${srcdir}/file1 ${srcdir}/file2  >${ResultFile} 2>&1
-TestResult ${srcdir}/test_baseline6 ${ResultFile}
+TestResult ${srcdir}/baseline.6 ${ResultFile}
 
 #      Test for accidental file overwrite.
-ResultFile=test_result7
-cp ${srcdir}/file2 tmp_file7
-${command}  -aA -dD -cC  ${srcdir}/file1 tmp_file7  tmp_file7  \
+ResultFile=result.7
+cp ${srcdir}/file2 tmp_file.7
+${command}  -aA -dD -cC  ${srcdir}/file1 tmp_file.7  tmp_file.7        \
                                                        >${ResultFile} 2>&1
-TestResult ${srcdir}/test_baseline7 ${ResultFile}
+TestResult ${srcdir}/baseline.7 ${ResultFile}
 
 #      Test -D option
-ResultFile=test_result8
+ResultFile=result.8
 ${command}  -D  ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1
-TestResult ${srcdir}/test_baseline8 ${ResultFile}
+TestResult ${srcdir}/baseline.8 ${ResultFile}
 
 #      Test -D  and  -M  options
-ResultFile=test_result9
+ResultFile=result.9
 ${command}  -D  -M '<<<<' '>>>>'                               \
                        ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1
-TestResult ${srcdir}/test_baseline9 ${ResultFile}
+TestResult ${srcdir}/baseline.9 ${ResultFile}
 
 #      Test -D  and  -B  options
-ResultFile=test_result10
+ResultFile=result.10
 ${command}  -D  -B  ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1
-TestResult ${srcdir}/test_baseline10 ${ResultFile}
+TestResult ${srcdir}/baseline.10 ${ResultFile}
 
 #      EOF

Index: tests/baseline
===================================================================
RCS file: tests/baseline
diff -N tests/baseline
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/baseline      13 Sep 2006 19:43:12 -0000      1.1
@@ -0,0 +1,17 @@
+.ll 25
+.pl 20
+.nf
+file1 and file2 #1
+.mc |
+file2 only
+file2 only
+.mc
+file1 and file2 #2
+.mc +
+file2 only
+.mc
+file1 and file2 #3
+.mc *
+.mc
+file1 and file2 #4
+file1 and file2 #5

Index: tests/baseline.10
===================================================================
RCS file: tests/baseline.10
diff -N tests/baseline.10
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/baseline.10   13 Sep 2006 19:43:12 -0000      1.1
@@ -0,0 +1,26 @@
+.ll 25
+.pl 20
+.nf
+file1 and file2 #1
+[[
+file1 only
+]]
+.
+.mc |
+file2 only
+file2 only
+.mc
+file1 and file2 #2
+.mc +
+file2 only
+.mc
+file1 and file2 #3
+[[
+file1 only
+file1 only
+]]
+.
+.mc *
+.mc
+file1 and file2 #4
+file1 and file2 #5

Index: tests/baseline.6
===================================================================
RCS file: tests/baseline.6
diff -N tests/baseline.6
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/baseline.6    13 Sep 2006 19:43:12 -0000      1.1
@@ -0,0 +1,17 @@
+.ll 25
+.pl 20
+.nf
+file1 and file2 #1
+.mc C
+file2 only
+file2 only
+.mc
+file1 and file2 #2
+.mc A
+file2 only
+.mc
+file1 and file2 #3
+.mc D
+.mc
+file1 and file2 #4
+file1 and file2 #5

Index: tests/baseline.7
===================================================================
RCS file: tests/baseline.7
diff -N tests/baseline.7
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/baseline.7    13 Sep 2006 19:43:12 -0000      1.1
@@ -0,0 +1,2 @@
+gdiffmk:  The FILE2 and OUTPUT arguments both point to the same file,
+gdiffmk:  `tmp_file.7', and it would be overwritten.

Index: tests/baseline.8
===================================================================
RCS file: tests/baseline.8
diff -N tests/baseline.8
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/baseline.8    13 Sep 2006 19:43:12 -0000      1.1
@@ -0,0 +1,26 @@
+.ll 25
+.pl 20
+.nf
+file1 and file2 #1
+[[
+file1 only
+]]
+.br
+.mc |
+file2 only
+file2 only
+.mc
+file1 and file2 #2
+.mc +
+file2 only
+.mc
+file1 and file2 #3
+[[
+file1 only
+file1 only
+]]
+.br
+.mc *
+.mc
+file1 and file2 #4
+file1 and file2 #5

Index: tests/baseline.9
===================================================================
RCS file: tests/baseline.9
diff -N tests/baseline.9
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/baseline.9    13 Sep 2006 19:43:12 -0000      1.1
@@ -0,0 +1,26 @@
+.ll 25
+.pl 20
+.nf
+file1 and file2 #1
+<<<<
+file1 only
+>>>>
+.br
+.mc |
+file2 only
+file2 only
+.mc
+file1 and file2 #2
+.mc +
+file2 only
+.mc
+file1 and file2 #3
+<<<<
+file1 only
+file1 only
+>>>>
+.br
+.mc *
+.mc
+file1 and file2 #4
+file1 and file2 #5

Index: tests/test_baseline
===================================================================
RCS file: tests/test_baseline
diff -N tests/test_baseline
--- tests/test_baseline 15 Dec 2004 06:04:49 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5

Index: tests/test_baseline10
===================================================================
RCS file: tests/test_baseline10
diff -N tests/test_baseline10
--- tests/test_baseline10       16 Jan 2005 01:43:21 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-[[
-file1 only
-]]
-.
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-[[
-file1 only
-file1 only
-]]
-.
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5

Index: tests/test_baseline6
===================================================================
RCS file: tests/test_baseline6
diff -N tests/test_baseline6
--- tests/test_baseline6        15 Dec 2004 06:04:49 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-.mc C
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc A
-file2 only
-.mc
-file1 and file2 #3
-.mc D
-.mc
-file1 and file2 #4
-file1 and file2 #5

Index: tests/test_baseline7
===================================================================
RCS file: tests/test_baseline7
diff -N tests/test_baseline7
--- tests/test_baseline7        16 Dec 2004 22:41:03 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-gdiffmk:  The FILE2 and OUTPUT arguments both point to the same file,
-gdiffmk:  `tmp_file7', and it would be overwritten.

Index: tests/test_baseline8
===================================================================
RCS file: tests/test_baseline8
diff -N tests/test_baseline8
--- tests/test_baseline8        16 Jan 2005 01:43:21 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-[[
-file1 only
-]]
-.br
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-[[
-file1 only
-file1 only
-]]
-.br
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5

Index: tests/test_baseline9
===================================================================
RCS file: tests/test_baseline9
diff -N tests/test_baseline9
--- tests/test_baseline9        16 Jan 2005 01:43:21 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-.ll 25
-.pl 20
-.nf
-file1 and file2 #1
-<<<<
-file1 only
->>>>
-.br
-.mc |
-file2 only
-file2 only
-.mc
-file1 and file2 #2
-.mc +
-file2 only
-.mc
-file1 and file2 #3
-<<<<
-file1 only
-file1 only
->>>>
-.br
-.mc *
-.mc
-file1 and file2 #4
-file1 and file2 #5