[GRASS-SVN] r64159 - in grass/branches/releasebranch_7_0: lib/gpde/test testsuite/raster

[svn_grass at osgeo.org]

Author: neteler
Date: 2015-01-13 23:54:14 -0800 (Tue, 13 Jan 2015)
New Revision: 64159

Modified:
   grass/branches/releasebranch_7_0/lib/gpde/test/test_arrays.c
   grass/branches/releasebranch_7_0/testsuite/raster/rmapcalc_test.sh
Log:
update g.remove calls (trac #2409)

Modified: grass/branches/releasebranch_7_0/lib/gpde/test/test_arrays.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gpde/test/test_arrays.c	2015-01-14 07:53:23 UTC (rev 64158)
+++ grass/branches/releasebranch_7_0/lib/gpde/test/test_arrays.c	2015-01-14 07:54:14 UTC (rev 64159)
@@ -294,7 +294,7 @@
 
 
     sprintf(buff,
-	    "g.remove -f type=rast name=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
+	    "g.remove -f type=raster name=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
     system(buff);
 
     N_free_array_2d(data1);
@@ -588,7 +588,7 @@
 
 
     sprintf(buff,
-	    "g.remove -f type=rast name=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
+	    "g.remove -f type=raster name=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
     system(buff);
 
 

Modified: grass/branches/releasebranch_7_0/testsuite/raster/rmapcalc_test.sh
===================================================================
--- grass/branches/releasebranch_7_0/testsuite/raster/rmapcalc_test.sh	2015-01-14 07:53:23 UTC (rev 64158)
+++ grass/branches/releasebranch_7_0/testsuite/raster/rmapcalc_test.sh	2015-01-14 07:54:14 UTC (rev 64159)
@@ -43,7 +43,7 @@
 cleanup()
 {
  echo "Removing temporary map"
- g.remove -f type=rast name=$TMPNAME > /dev/null
+ g.remove -f type=raster name=$TMPNAME > /dev/null
 }
 
 # check if a MASK is already present:
@@ -63,7 +63,7 @@
  #restore user mask if present:
  if test -f $LOCATION/cell/$USERMASK ; then
   echo "Restoring user MASK"
-  g.remove -f type=rast name=MASK > /dev/null
+  g.remove -f type=raster name=MASK > /dev/null
   g.rename $USERMASK,MASK > /dev/null
  fi
 }