[Cvs-cvs] Changes to ccvs/src/sanity.sh

[Derek Robert Price]

Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1079 ccvs/src/sanity.sh:1.1080
--- ccvs/src/sanity.sh:1.1079   Mon Sep  5 18:14:41 2005
+++ ccvs/src/sanity.sh  Mon Sep  5 22:05:29 2005
@@ -19203,7 +19203,7 @@
          cd ../first-dir
          echo line2 >>file1
          dotest_fail info-v2 "${testcvs} -q ci -m bogus" \
-"vscript $TMPDIR/[a-zA-Z0-9.]* file1 1\.3
+"vscript $TMPDIR/$tempname file1 1\.3
 No BugId found\.
 ${SPROG} \[commit aborted\]: Message verification failed"
 
@@ -19212,7 +19212,7 @@
 and many more lines after it
 EOF
          dotest info-v3 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
-"vscript $TMPDIR/[a-zA-Z0-9.]* file1 1\.3
+"vscript $TMPDIR/$tempname file1 1\.3
 $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
 new revision: 1\.4; previous revision: 1\.3"
          rm ${TESTDIR}/comment.tmp
@@ -19223,19 +19223,19 @@
          touch file2
          dotest_fail info-v4 \
            "${testcvs} import -m bogus first-dir/another x y" \
-"vscript $TMPDIR/[a-zA-Z0-9.]* - Imported sources NONE
+"vscript $TMPDIR/$tempname - Imported sources NONE
 No BugId found\.
 ${SPROG} \[import aborted\]: Message verification failed"
 
          # now verify that directory dependent verifymsgs work
          dotest info-v5 \
            "${testcvs} import -m bogus first-dir/yet-another x y" \
-"vscript2 $TMPDIR/[a-zA-Z0-9.]* - Imported sources NONE
+"vscript2 $TMPDIR/$tempname - Imported sources NONE
 $TESTDIR/wnt/another-dir
 N first-dir/yet-another/file2
 
 No conflicts created by this import" \
-"vscript2 $TMPDIR/[a-zA-Z0-9.]* - Imported sources NONE
+"vscript2 $TMPDIR/$tempname - Imported sources NONE
 $CVSROOT_DIRNAME/first-dir/yet-another
 N first-dir/yet-another/file2
 
@@ -19254,13 +19254,13 @@
          if $remote; then
            dotest_fail info-v6r \
              "${testcvs} import -m bogus first-dir/yet-another/and-another x 
y" \
-"vscript2 $TMPDIR/[a-zA-Z0-9.]* - Imported sources NONE
+"vscript2 $TMPDIR/$tempname - Imported sources NONE
 $CVSROOT_DIRNAME/first-dir/yet-another/and-another
 $SPROG \[import aborted\]: Message verification failed"
          else
            dotest info-v6 \
              "${testcvs} import -m bogus first-dir/yet-another/and-another x 
y" \
-"vscript2 $TMPDIR/[a-zA-Z0-9.]* - Imported sources NONE
+"vscript2 $TMPDIR/$tempname - Imported sources NONE
 $TESTDIR/wnt/another-dir
 N first-dir/yet-another/and-another/file2
 
@@ -19298,7 +19298,7 @@
 See what happens next.
 EOF
          dotest info-reread-2 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
-"vscript $TMPDIR/[a-zA-Z0-9.]* file1 1\.4
+"vscript $TMPDIR/$tempname file1 1\.4
 $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
 new revision: 1\.5; previous revision: 1\.4"
          dotest info-reread-3 "${testcvs} -q log -N -r1.5 file1" "
@@ -19324,7 +19324,7 @@
 See what happens next with stat.
 EOF
          dotest info-reread-5 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
-"vscript $TMPDIR/[a-zA-Z0-9.]* file1 1\.5
+"vscript $TMPDIR/$tempname file1 1\.5
 $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
 new revision: 1\.6; previous revision: 1\.5"
          dotest info-reread-6 "${testcvs} -q log -N -r1.6 file1" "
@@ -19350,7 +19350,7 @@
 See what happens next.
 EOF
          dotest info-reread-8 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
-"vscript $TMPDIR/[a-zA-Z0-9.]* file1 1\.6
+"vscript $TMPDIR/$tempname file1 1\.6
 $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
 new revision: 1\.7; previous revision: 1\.6"
          dotest info-reread-6 "${testcvs} -q log -N -r1.7 file1" "