[GRASS-SVN] r73357 - in grass/trunk: raster/r.mapcalc/testsuite testsuite/raster

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2018-09-16 19:30:53 -0700 (Sun, 16 Sep 2018)
New Revision: 73357

Modified:
   grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh
   grass/trunk/testsuite/raster/raster_md5test.sh
Log:
tests: don't use LOCATION to mean full path to mapset (see #2681)

Modified: grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh
===================================================================
--- grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh	2018-09-17 02:18:44 UTC (rev 73356)
+++ grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh	2018-09-17 02:30:53 UTC (rev 73357)
@@ -29,7 +29,7 @@
 
 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 @@
 # 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 @@
  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 @@
 #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

Modified: grass/trunk/testsuite/raster/raster_md5test.sh
===================================================================
--- grass/trunk/testsuite/raster/raster_md5test.sh	2018-09-17 02:18:44 UTC (rev 73356)
+++ grass/trunk/testsuite/raster/raster_md5test.sh	2018-09-17 02:30:53 UTC (rev 73357)
@@ -37,7 +37,7 @@
 
 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 @@
 # 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 @@
  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