Procházet zdrojové kódy

tests: don't use LOCATION to mean full path to mapset (see https://trac.osgeo.org/grass/ticket/2681)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@73357 15284696-431f-4ddb-bdfa-cd5b030d7da7
Vaclav Petras před 6 roky
rodič
revize
fbfdcbfc6b

+ 4 - 4
raster/r.mapcalc/testsuite/const_map_test.sh

@@ -29,7 +29,7 @@ export LC_NUMERIC=C
 
 eval `g.gisenv`
 : ${GISBASE?} ${GISDBASE?} ${LOCATION_NAME?} ${MAPSET?}
-LOCATION=$GISDBASE/$LOCATION_NAME/$MAPSET
+MAPSET_PATH=$GISDBASE/$LOCATION_NAME/$MAPSET
 
 # some definitions
 PIXEL=3
@@ -49,7 +49,7 @@ cleanup()
 # check if a MASK is already present:
 MASKTMP=mask.$TMPNAME
 USERMASK=usermask_${MASKTMP}
-if test -f $LOCATION/cell/MASK
+if test -f $MAPSET_PATH/cell/MASK
 then
  echo "A user raster mask (MASK) is present. Saving it..."
  g.rename raster=MASK,$USERMASK > /dev/null
@@ -61,7 +61,7 @@ finalcleanup()
  g.region region=$TMPNAME
  g.remove -f type=region name=$TMPNAME > /dev/null
  #restore user mask if present:
- if test -f $LOCATION/cell/$USERMASK ; then
+ if test -f $MAPSET_PATH/cell/$USERMASK ; then
   echo "Restoring user MASK"
   g.remove -f type=raster name=MASK > /dev/null
   g.rename raster=$USERMASK,MASK > /dev/null
@@ -109,7 +109,7 @@ compare_result()
 #check if a MASK is already present:
 MASKTMP=mask.$TMPNAME
 USERMASK=usermask_${MASKTMP}
-if test -f $LOCATION/cell/MASK
+if test -f $MAPSET_PATH/cell/MASK
 then
  echo "A user raster mask (MASK) is present. Saving it..."
  g.rename raster=MASK,$USERMASK > /dev/null

+ 3 - 3
testsuite/raster/raster_md5test.sh

@@ -37,7 +37,7 @@ export LC_NUMERIC=C
 
 eval `g.gisenv`
 : ${GISBASE?} ${GISDBASE?} ${LOCATION_NAME?} ${MAPSET?}
-LOCATION=$GISDBASE/$LOCATION_NAME/$MAPSET
+MAPSET_PATH=$GISDBASE/$LOCATION_NAME/$MAPSET
 
 # some definitions
 PIXEL=3
@@ -54,7 +54,7 @@ cleanup()
 # check if a MASK is already present:
 MASKTMP=mask.$TMPNAME
 USERMASK=usermask_${MASKTMP}
-if test -f $LOCATION/cell/MASK
+if test -f $MAPSET_PATH/cell/MASK
 then
  echo "A user raster mask (MASK) is present. Saving it..."
  g.rename raster=MASK,$USERMASK > /dev/null
@@ -66,7 +66,7 @@ finalcleanup()
  g.region region=$TMPNAME
  g.remove -f type=region name=$TMPNAME > /dev/null
  #restore user mask if present:
- if test -f $LOCATION/cell/$USERMASK ; then
+ if test -f $MAPSET_PATH/cell/$USERMASK ; then
   echo "Restoring user MASK"
   g.remove -f type=raster name=MASK > /dev/null
   g.rename raster=$USERMASK,MASK > /dev/null