* tests/test_baseline*: Renamed to...

* tests/baseline.*: This.

* tests/runtests.in: Updated.

8 files changed, 32 insertions, 25 deletions

diff --git a/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog
index f8e3f963..0612a2b7 100644
--- a/contrib/gdiffmk/ChangeLog
+++ b/contrib/gdiffmk/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-13  Werner LEMBERG  <wl@gnu.org>
+
+	* tests/test_baseline*: Renamed to...
+	* tests/baseline.*: This.
+
+	* tests/runtests.in: Updated.
+
 2005-01-16  Mike Bianchi  <MBianchi@Foveal.com>
 
 	* gdiffmk.sh (Usage): Fix typos.
diff --git a/contrib/gdiffmk/tests/test_baseline b/contrib/gdiffmk/tests/baseline
index 6b329926..6b329926 100644
--- a/contrib/gdiffmk/tests/test_baseline
+++ b/contrib/gdiffmk/tests/baseline
diff --git a/contrib/gdiffmk/tests/test_baseline10 b/contrib/gdiffmk/tests/baseline.10
index b523f452..b523f452 100644
--- a/contrib/gdiffmk/tests/test_baseline10
+++ b/contrib/gdiffmk/tests/baseline.10
diff --git a/contrib/gdiffmk/tests/test_baseline6 b/contrib/gdiffmk/tests/baseline.6
index 3156961b..3156961b 100644
--- a/contrib/gdiffmk/tests/test_baseline6
+++ b/contrib/gdiffmk/tests/baseline.6
diff --git a/contrib/gdiffmk/tests/test_baseline7 b/contrib/gdiffmk/tests/baseline.7
index b65e8320..9d2c8dcb 100644
--- a/contrib/gdiffmk/tests/test_baseline7
+++ b/contrib/gdiffmk/tests/baseline.7
@@ -1,2 +1,2 @@
 gdiffmk:  The FILE2 and OUTPUT arguments both point to the same file,
-gdiffmk:  `tmp_file7', and it would be overwritten.
+gdiffmk:  `tmp_file.7', and it would be overwritten.
diff --git a/contrib/gdiffmk/tests/test_baseline8 b/contrib/gdiffmk/tests/baseline.8
index 9846dd58..9846dd58 100644
--- a/contrib/gdiffmk/tests/test_baseline8
+++ b/contrib/gdiffmk/tests/baseline.8
diff --git a/contrib/gdiffmk/tests/test_baseline9 b/contrib/gdiffmk/tests/baseline.9
index 50fe57d6..50fe57d6 100644
--- a/contrib/gdiffmk/tests/test_baseline9
+++ b/contrib/gdiffmk/tests/baseline.9
diff --git a/contrib/gdiffmk/tests/runtests.in b/contrib/gdiffmk/tests/runtests.in
index 82952652..c349a9a2 100644
--- a/contrib/gdiffmk/tests/runtests.in
+++ b/contrib/gdiffmk/tests/runtests.in
@@ -8,7 +8,7 @@ command=../gdiffmk
 #	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 @@ case $#-$1 in
 	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 @@ trap 'rm -f ${tmpfile}' 0 1 2 3 15
 #	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