Browse Source

update g.remove calls (trac https://trac.osgeo.org/grass/ticket/2409)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@64159 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 10 years ago
parent
commit
2e0bf2f743
2 changed files with 4 additions and 4 deletions
  1. 2 2
      lib/gpde/test/test_arrays.c
  2. 2 2
      testsuite/raster/rmapcalc_test.sh

+ 2 - 2
lib/gpde/test/test_arrays.c

@@ -294,7 +294,7 @@ int io_bench_2d(void)
 
 
     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 @@ int test_array_2d(void)
 
 
     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);
 
 

+ 2 - 2
testsuite/raster/rmapcalc_test.sh

@@ -43,7 +43,7 @@ TMPNAME="`echo ${PID}_tmp_testmap | sed 's+\.+_+g'`"
 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 @@ finalcleanup()
  #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
 }