[Groff-commit] groff/contrib/gdiffmk ChangeLog Makefile.sub te...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 04/12/16 22:41:03

Modified files:
        contrib/gdiffmk: ChangeLog Makefile.sub 
        contrib/gdiffmk/tests: .cvsignore runtests.in test_baseline7 
Added files:
        contrib/gdiffmk: .cvsignore 

Log message:
        Updates.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/.cvsignore?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/Makefile.sub.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/.cvsignore.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/runtests.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/test_baseline7.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.5 groff/contrib/gdiffmk/ChangeLog:1.6
--- groff/contrib/gdiffmk/ChangeLog:1.5 Thu Dec 16 22:08:04 2004
+++ groff/contrib/gdiffmk/ChangeLog     Thu Dec 16 22:41:03 2004
@@ -1,8 +1,10 @@
 2004-12-15  Werner LEMBERG  <address@hidden>
 
+       The configure script now generates tests/runtests.
+
        * tests/tests.sh: Renamed to...
        * tests/runtests.in: This.
-       * README: Updated.
+       * README, Makefile.sub (CLEANADD), tests/test_baseline7: Updated.
 
 2004-12-14  Werner LEMBERG  <address@hidden>
 
Index: groff/contrib/gdiffmk/Makefile.sub
diff -u groff/contrib/gdiffmk/Makefile.sub:1.2 
groff/contrib/gdiffmk/Makefile.sub:1.3
--- groff/contrib/gdiffmk/Makefile.sub:1.2      Sun Dec 12 14:04:52 2004
+++ groff/contrib/gdiffmk/Makefile.sub  Thu Dec 16 22:41:03 2004
@@ -27,7 +27,7 @@
 ########################################################################
 
 MAN1=gdiffmk.n
-CLEANADD=gdiffmk
+CLEANADD=gdiffmk tests/runtests
 
 all: gdiffmk
 
Index: groff/contrib/gdiffmk/tests/.cvsignore
diff -u groff/contrib/gdiffmk/tests/.cvsignore:1.2 
groff/contrib/gdiffmk/tests/.cvsignore:1.3
--- groff/contrib/gdiffmk/tests/.cvsignore:1.2  Thu Dec 16 14:23:44 2004
+++ groff/contrib/gdiffmk/tests/.cvsignore      Thu Dec 16 22:41:03 2004
@@ -1,2 +1,3 @@
 test_result*
 tmp_file*
+runtests
Index: groff/contrib/gdiffmk/tests/runtests.in
diff -u groff/contrib/gdiffmk/tests/runtests.in:1.1 
groff/contrib/gdiffmk/tests/runtests.in:1.2
--- groff/contrib/gdiffmk/tests/runtests.in:1.1 Thu Dec 16 22:08:04 2004
+++ groff/contrib/gdiffmk/tests/runtests.in     Thu Dec 16 22:41:03 2004
@@ -1,7 +1,9 @@
 #!/bin/sh
 #      A very simple function test for gdiffmk.sh.
 
-command=../gdiffmk.sh
address@hidden@
+
+command=../gdiffmk
 
 #      Test the number of arguments and the first argument.
 case $#-$1 in
@@ -34,39 +36,43 @@
 tmpfile=/tmp/$$
 trap 'rm -f ${tmpfile}' 0 1 2 3 15
 
+#      Run tests.
+
 #      3 file arguments
 ResultFile=test_result1
-sh ${command}  file1  file2 ${ResultFile} 2>${tmpfile}
+${command}  $(srcdir)/file1  $(srcdir)/file2 ${ResultFile} 2>${tmpfile}
 cat ${tmpfile} >>${ResultFile}
-TestResult test_baseline ${ResultFile}
+TestResult $(srcdir)/test_baseline ${ResultFile}
 
 #      OUTPUT to stdout by default
 ResultFile=test_result2
-sh ${command}  file1  file2  >${ResultFile} 2>&1
-TestResult test_baseline ${ResultFile}
+${command}  $(srcdir)/file1  $(srcdir)/file2  >${ResultFile} 2>&1
+TestResult $(srcdir)/test_baseline ${ResultFile}
 
 #      OUTPUT to stdout via  -  argument
 ResultFile=test_result3
-sh ${command}  file1  file2 - >${ResultFile} 2>&1
-TestResult test_baseline ${ResultFile}
+${command}  $(srcdir)/file1  $(srcdir)/file2 - >${ResultFile} 2>&1
+TestResult $(srcdir)/test_baseline ${ResultFile}
 
 #      FILE1 from standard input via  -  argument
 ResultFile=test_result4
-sh ${command}  - file2 <file1  >${ResultFile} 2>&1
-TestResult test_baseline ${ResultFile}
+${command}  - $(srcdir)/file2 <$(srcdir)/file1  >${ResultFile} 2>&1
+TestResult $(srcdir)/test_baseline ${ResultFile}
 
 #      FILE2 from standard input via  -  argument
 ResultFile=test_result5
-sh ${command}  file1 - <file2  >${ResultFile} 2>&1
-TestResult test_baseline ${ResultFile}
+${command}  $(srcdir)/file1 - <$(srcdir)/file2  >${ResultFile} 2>&1
+TestResult $(srcdir)/test_baseline ${ResultFile}
 
 #      Different values for addmark, changemark, deletemark
 ResultFile=test_result6
-sh ${command}  -aA -cC -dD  file1 file2  >${ResultFile} 2>&1
-TestResult test_baseline6 ${ResultFile}
+${command}  -aA -cC -dD  $(srcdir)/file1 $(srcdir)/file2  >${ResultFile} 2>&1
+TestResult $(srcdir)/test_baseline6 ${ResultFile}
 
 #      Test for accidental file overwrite.
 ResultFile=test_result7
-cp file2 tmp_file7
-sh ${command}  -aA -dD -cC  file1 tmp_file7  tmp_file7  >${ResultFile} 2>&1
-TestResult test_baseline7 ${ResultFile}
+cp $(srcdir)/file2 tmp_file7
+${command}  -aA -dD -cC  $(srcdir)/file1 tmp_file7  tmp_file7  >${ResultFile} 
2>&1
+TestResult $(srcdir)/test_baseline7 ${ResultFile}
+
+#      EOF
Index: groff/contrib/gdiffmk/tests/test_baseline7
diff -u groff/contrib/gdiffmk/tests/test_baseline7:1.1 
groff/contrib/gdiffmk/tests/test_baseline7:1.2
--- groff/contrib/gdiffmk/tests/test_baseline7:1.1      Wed Dec 15 06:04:49 2004
+++ groff/contrib/gdiffmk/tests/test_baseline7  Thu Dec 16 22:41:03 2004
@@ -1,2 +1,2 @@
-gdiffmk.sh:  The FILE2 and OUTPUT arguments both point to the same file,
-gdiffmk.sh:  `tmp_file7', and it would be overwritten.
+gdiffmk:  The FILE2 and OUTPUT arguments both point to the same file,
+gdiffmk:  `tmp_file7', and it would be overwritten.