Change tge way the regression test uses the scratch directory.

Removes the risk from crearing test files in the source directory.

It passes.

diff --git a/srctest b/srctest
index 5eec9ceef04288d8551444680097865aaa344aa8..610b9fa992c09e179a48703f359d1e7002511157 100755 (executable)
--- a/srctest
+++ b/srctest
@@ -14,7 +14,7 @@ SANDBOX=$(mktemp -u /tmp/.src_XXXXXXXX)
 # head version of src can always be tested.
 PATH="$(pwd)":$PATH
 
-trap "rm -fr testfile* testrev* newname* $SANDBOX" 0 1 2 15
+trap "rm -fr $SANDBOX" 0 1 2 15
 
 check() {
     case $? in
@@ -23,7 +23,12 @@ check() {
     esac
 }
 
-TESTOPTS="-T -S $SANDBOX $*"
+mkdir $SANDBOX
+check "scratch directory creation"
+
+cd $SANDBOX
+
+TESTOPTS="-T $*"
 
 cat >testfile1 <<EOF
 Now is the time
@@ -169,13 +174,13 @@ check "tag list check after deletion"
 src $TESTOPTS tag delete basetag
 check "tag deletion: basetag"
 
-mkdir $SANDBOX/foo
+mkdir foo
 src $TESTOPTS fast-export testfile1 >testfile14
-cat testfile14 | (cd $SANDBOX/foo >/dev/null; git init --quiet; git fast-import --quiet)
-(cd $SANDBOX/foo; git fast-export --all) >testfile15
+cat testfile14 | (cd foo >/dev/null; git init --quiet; git fast-import --quiet)
+(cd foo >/dev/null; git fast-export --all) >testfile15
 diff -u testfile14 testfile15
 check "fast-export"
-rm -fr $SANDBOX/foo
+rm -fr foo
 
 # There was a point at which fast-export was broken,
 # but the test was passing because an empty file
@@ -185,7 +190,7 @@ check "fast-export content check"
 
 src $TESTOPTS rename testfile1 newname1
 check "move command"
-if [ -e newname1 -a -e $SANDBOX/newname1,v ]
+if [ -e newname1 -a -e .src/newname1,v ]
 then
     echo "srctest: content move succeeded"
 else
@@ -195,7 +200,7 @@ fi
 
 src $TESTOPTS copy newname1 newname2
 check "copy command"
-if [ -e newname2 -a -e $SANDBOX/newname2,v ]
+if [ -e newname2 -a -e .src/newname2,v ]
 then
     echo "srctest: content copy succeeded"
 else
@@ -226,7 +231,7 @@ src $TESTOPTS checkout testfile16
 src $TESTOPTS status testfile16 | grep "^[.]" >/dev/null
 check ". status check after restoration"
 
-rm -f $SANDBOX/testfile16,v
+rm -f .src/testfile16,v
 src $TESTOPTS status testfile16 | grep "^?" >/dev/null
 check "? status check after master deletion"