Przeglądaj źródła

r3.neighbors: testsuite: Better overwrite handling in test script

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@61286 15284696-431f-4ddb-bdfa-cd5b030d7da7
Soeren Gebbert 11 lat temu
rodzic
commit
d8f58a0739

+ 10 - 8
raster3d/r3.neighbors/test_suite/test.r3.neighbors.sh

@@ -1,33 +1,35 @@
 #!/bin/sh
 #!/bin/sh
 
 
+export GRASS_OVERWRITE=1
+
 g.region w=0 e=30 s=0 n=30 b=0 t=30 res3=10
 g.region w=0 e=30 s=0 n=30 b=0 t=30 res3=10
 
 
-r3.mapcalc --o expr="test_neighbor_float  = float(3)"
-r3.mapcalc --o expr="test_neighbor_double = double(3)"
-r3.mapcalc --o expr="test_neighbor_null = null()"
+r3.mapcalc  expr="test_neighbor_float  = float(3)"
+r3.mapcalc  expr="test_neighbor_double = double(3)"
+r3.mapcalc  expr="test_neighbor_null = null()"
 
 
 # First @test with float values with @precision=2
 # First @test with float values with @precision=2
 r3.neighbors input=test_neighbor_float output=test_neighbor_float_average \
 r3.neighbors input=test_neighbor_float output=test_neighbor_float_average \
-    method=average window=3,3,3 --o
+    method=average window=3,3,3 
 r3.out.ascii dp=2 input=test_neighbor_float_average output=test_neighbor_float_average.txt
 r3.out.ascii dp=2 input=test_neighbor_float_average output=test_neighbor_float_average.txt
 
 
 r3.neighbors input=test_neighbor_float output=test_neighbor_float_sum \
 r3.neighbors input=test_neighbor_float output=test_neighbor_float_sum \
-    method=sum window=3,3,3 --o
+    method=sum window=3,3,3 
 r3.out.ascii dp=2 input=test_neighbor_float_sum output=test_neighbor_float_sum.txt
 r3.out.ascii dp=2 input=test_neighbor_float_sum output=test_neighbor_float_sum.txt
 
 
 # Second @test with double values
 # Second @test with double values
 r3.neighbors input=test_neighbor_double output=test_neighbor_double_average \
 r3.neighbors input=test_neighbor_double output=test_neighbor_double_average \
-    method=average window=3,3,3 --o
+    method=average window=3,3,3 
 r3.out.ascii dp=2 input=test_neighbor_double_average output=test_neighbor_double_average.txt
 r3.out.ascii dp=2 input=test_neighbor_double_average output=test_neighbor_double_average.txt
 
 
 r3.neighbors input=test_neighbor_double output=test_neighbor_double_sum \
 r3.neighbors input=test_neighbor_double output=test_neighbor_double_sum \
-    method=sum window=3,3,3 --o
+    method=sum window=3,3,3 
 r3.out.ascii dp=2 input=test_neighbor_double_sum output=test_neighbor_double_sum.txt
 r3.out.ascii dp=2 input=test_neighbor_double_sum output=test_neighbor_double_sum.txt
 
 
 # Third @test with null values
 # Third @test with null values
 
 
 r3.neighbors input=test_neighbor_null output=test_neighbor_null_sum \
 r3.neighbors input=test_neighbor_null output=test_neighbor_null_sum \
-    method=sum window=3,3,3 --o
+    method=sum window=3,3,3 
 r3.out.ascii dp=2 input=test_neighbor_null_sum output=test_neighbor_null_sum.txt
 r3.out.ascii dp=2 input=test_neighbor_null_sum output=test_neighbor_null_sum.txt