[GRASS-SVN] r63635 - in grass/branches/releasebranch_7_0: . raster/r.cost/test_suite raster/r.series/test_suite raster/r.series.accumulate/test_suite raster/r.stats/test_suite raster/r.timestamp/test_suite raster3d/r3.in.bin/test_suite raster3d/r3.neighbors/test_suite raster3d/r3.timestamp/test_suite scripts/v.unpack/test_suite vector/v.surf.bspline/test_suite vector/v.surf.rst/test_suite vector/v.timestamp/test_suite vector/v.what.rast3/test_suite
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Dec 19 15:48:16 PST 2014
Author: neteler
Date: 2014-12-19 15:48:16 -0800 (Fri, 19 Dec 2014)
New Revision: 63635
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/raster/r.cost/test_suite/profile.sh
grass/branches/releasebranch_7_0/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh
grass/branches/releasebranch_7_0/raster/r.series/test_suite/test.r.series.sh
grass/branches/releasebranch_7_0/raster/r.stats/test_suite/profile.sh
grass/branches/releasebranch_7_0/raster/r.timestamp/test_suite/test.r.timestamp.sh
grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh
grass/branches/releasebranch_7_0/raster3d/r3.neighbors/test_suite/test.r3.neighbors.sh
grass/branches/releasebranch_7_0/raster3d/r3.timestamp/test_suite/test.r3.timestamp.sh
grass/branches/releasebranch_7_0/scripts/v.unpack/test_suite/test.v.unpack.sh
grass/branches/releasebranch_7_0/vector/v.surf.bspline/test_suite/profile_cmd.sh
grass/branches/releasebranch_7_0/vector/v.surf.rst/test_suite/profile.sh
grass/branches/releasebranch_7_0/vector/v.timestamp/test_suite/test.v.timestamp.sh
grass/branches/releasebranch_7_0/vector/v.what.rast3/test_suite/test.v.what.rast3.sh
Log:
some shell test scripts updated (trunk, r63634)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,
63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63297,63302,63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63616,63624,63626,63628,63630
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,
63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63297,63302,63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63616,63624,63626,63628,63630,63634
Modified: grass/branches/releasebranch_7_0/raster/r.cost/test_suite/profile.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.cost/test_suite/profile.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/raster/r.cost/test_suite/profile.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -1,8 +1,16 @@
-# NC dataset
-g.region raster=elevation -p
+# NC dataset, http://grass.osgeo.org/download/sample-data/
+
+OUTFILE=callgrind.out.1196
+MAP=elevation
+export GRASS_OVERWRITE=1
+
+g.region raster=$MAP -p
r.mapcalc 'one = 1'
-CMD="r.cost -k in=one start_points=school_copy output=cost.test --o"
+CMD="r.cost -k in=one start_points=schools_wake output=cost.test --o"
-valgrind --tool=callgrind --trace-children=yes $CMD
-kcachegrind callgrind.out.1196
+valgrind --tool=callgrind --callgrind-out-file=$OUTFILE --trace-children=yes $CMD
+g.remove --q -f type=raster name=one
+
+# http://kcachegrind.sourceforge.net
+kcachegrind $OUTFILE
Modified: grass/branches/releasebranch_7_0/raster/r.series/test_suite/test.r.series.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.series/test_suite/test.r.series.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/raster/r.series/test_suite/test.r.series.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -32,7 +32,7 @@
EOF
-# The second file includes weights. The deafult weight of 1.0
+# The second file includes weights. The default weight of 1.0
# must not be specified
cat > "${TMP_FILE_WEIGHTS}" << EOF
prec_1|3
Modified: grass/branches/releasebranch_7_0/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -12,9 +12,9 @@
r.mapcalc expr="lower = 5"
r.mapcalc expr="upper = 10"
-r.mapcalc expr="map_a = rand(0, 15)"
-r.mapcalc expr="map_b = rand(1, 14)"
-r.mapcalc expr="map_c = rand(2, 13)"
+r.mapcalc expr="map_a = rand(0, 15)" -s
+r.mapcalc expr="map_b = rand(1, 14)" -s
+r.mapcalc expr="map_c = rand(2, 13)" -s
# BEDD with lower limit map and upper limit value
r.series.accumulate basemap=basemap input=map_a lower=lower limits=5,10 \
@@ -24,19 +24,19 @@
output=test_accu_1 method=gdd -f --verbose
# Winkler with lower limit map
r.series.accumulate basemap=basemap input=map_a lower=lower \
- output=test_accu_2 method=gdd -a -f --verbose
+ output=test_accu_2 method=gdd -f --verbose
# Mean
r.series.accumulate basemap=basemap input=map_a \
output=test_accu_3 method=mean --verbose
# Average
r.series.accumulate basemap=basemap input=map_a \
- output=test_accu_3 method=mean -a --verbose
+ output=test_accu_3 method=mean --verbose
# GDD with lower limit value
r.series.accumulate basemap=basemap input=map_a,map_b,map_c limits=5,10 \
output=test_accu_4 method=gdd -f --verbose
# Winkler with multiple maps, lower limit value
r.series.accumulate basemap=basemap input=map_a,map_b,map_c limits=5,10 \
- output=test_accu_5 method=bedd -a -f --verbose
+ output=test_accu_5 method=bedd -f --verbose
# BEDD with multiple maps, lower limit map and upper limit value
r.series.accumulate basemap=basemap input=map_a,map_b,map_c lower=lower limits=5,10 \
output=test_accu_6 method=bedd -f --verbose
@@ -52,12 +52,13 @@
# Test for correct results
for map in `g.list type=rast pattern=test_accu_*` ; do
- r.out.ascii input=${map} output=${map}.ref dp=2
+ r.out.ascii input=${map} output=${map}.ref precision=2
done
-for i in `ls test_accu_*.txt` ; do
- diff $i "`basename $i .txt`.ref" >> out.diff
+for i in `ls test_accu_*.ref` ; do
+ diff $i "`basename $i`" >> out.diff
done
+rm -f test_accu_*.ref
CHAR_NUM=`cat out.diff | wc -c`
Modified: grass/branches/releasebranch_7_0/raster/r.stats/test_suite/profile.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.stats/test_suite/profile.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/raster/r.stats/test_suite/profile.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -1,11 +1,16 @@
-#spearfish
-MAP=elevation.10m
-g.region raster=$MAP
+# NC dataset, http://grass.osgeo.org/download/sample-data/
+
+OUTFILE=callgrind.out.1196
+MAP=elevation
+export GRASS_OVERWRITE=1
+
+g.region raster=$MAP -p
+
CMD="r.stats -a $MAP"
time $CMD
-valgrind --tool=callgrind --trace-children=yes $CMD
+valgrind --tool=callgrind --callgrind-out-file=$OUTFILE --trace-children=yes $CMD
-kcachegrind callgrind.out.12345
-
+# http://kcachegrind.sourceforge.net
+kcachegrind $OUTFILE
Modified: grass/branches/releasebranch_7_0/raster/r.timestamp/test_suite/test.r.timestamp.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.timestamp/test_suite/test.r.timestamp.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/raster/r.timestamp/test_suite/test.r.timestamp.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -49,6 +49,7 @@
r.timestamp map=map date=none
# The third @test to check @failure with wrong time stamps
+g.message message="Now checking for expected failures due to wrong time stamps..."
r.timestamp map=map date="2 years 3 months 8 days"
r.timestamp map=map date="1 month 5 days"
r.timestamp map=map date="July 2003"
Modified: grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -4,8 +4,8 @@
r3.mapcalc --o expr="test_out_bin_float = float(if(row() == 2, null(), row()))"
r3.mapcalc --o expr="test_out_bin_double = double(if(row() == 2, null(), row()))"
-r3.out.ascii --o dp=0 input=test_out_bin_float output=test_out_bin_float.ref;
-r3.out.ascii --o dp=0 input=test_out_bin_double output=test_out_bin_double.ref;
+r3.out.ascii --o precision=0 input=test_out_bin_float output=test_out_bin_float.ref;
+r3.out.ascii --o precision=0 input=test_out_bin_double output=test_out_bin_double.ref;
# @test
@@ -125,7 +125,7 @@
cols=18 rows=9 depths=10
for map in `g.list type=raster3d pattern=test_in_bin_float*` ; do
- r3.out.ascii input=${map} output=${map}.txt dp=0
+ r3.out.ascii input=${map} output=${map}.txt precision=0
done
for i in `ls test_in_bin_float_*.txt` ; do
Modified: grass/branches/releasebranch_7_0/raster3d/r3.neighbors/test_suite/test.r3.neighbors.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.neighbors/test_suite/test.r3.neighbors.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/raster3d/r3.neighbors/test_suite/test.r3.neighbors.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -11,25 +11,25 @@
# First @test with float values with @precision=2
r3.neighbors input=test_neighbor_float output=test_neighbor_float_average \
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 precision=2 input=test_neighbor_float_average output=test_neighbor_float_average.txt
r3.neighbors input=test_neighbor_float output=test_neighbor_float_sum \
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 precision=2 input=test_neighbor_float_sum output=test_neighbor_float_sum.txt
# Second @test with double values
r3.neighbors input=test_neighbor_double output=test_neighbor_double_average \
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 precision=2 input=test_neighbor_double_average output=test_neighbor_double_average.txt
r3.neighbors input=test_neighbor_double output=test_neighbor_double_sum \
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 precision=2 input=test_neighbor_double_sum output=test_neighbor_double_sum.txt
# Third @test with null values
r3.neighbors input=test_neighbor_null output=test_neighbor_null_sum \
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 precision=2 input=test_neighbor_null_sum output=test_neighbor_null_sum.txt
Modified: grass/branches/releasebranch_7_0/raster3d/r3.timestamp/test_suite/test.r3.timestamp.sh
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.timestamp/test_suite/test.r3.timestamp.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/raster3d/r3.timestamp/test_suite/test.r3.timestamp.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -49,6 +49,7 @@
r3.timestamp map=map3d date=none
# The third @test to check @failure with wrong time stamps
+g.message message="Now checking for expected failures due to wrong time stamps..."
r3.timestamp map=map3d date="2 years 3 months 8 days"
r3.timestamp map=map3d date="1 month 5 days"
r3.timestamp map=map3d date="July 2003"
Modified: grass/branches/releasebranch_7_0/scripts/v.unpack/test_suite/test.v.unpack.sh
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.unpack/test_suite/test.v.unpack.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/scripts/v.unpack/test_suite/test.v.unpack.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -39,7 +39,7 @@
# We need to clean before import
g.remove -f type=vector name=probe_1,probe_2,probe_3
-# Test the import with v.unpack
+# Test the compressed import with v.unpack
v.unpack --o input=probe_1.pack
v.category input=probe_1 option=report
v.unpack --o input=probe_2.pack
@@ -47,13 +47,13 @@
v.unpack --o input=probe_3.pack
v.category input=probe_3 option=report
-# Test the import with v.unpack
-v.unpack --o input=probe_1.pack output=probe_1_uncompressed
+# Test the uncompressed import with v.unpack (Seems to fail?)
+v.unpack --o input=probe_1_uncompressed.pack output=probe_1_uncompressed
v.category input=probe_1_uncompressed option=report
-v.unpack --o input=probe_2.pack output=probe_2_uncompressed
+v.unpack --o input=probe_2_uncompressed.pack output=probe_2_uncompressed
v.category input=probe_2_uncompressed option=report
-v.unpack --o input=probe_3.pack output=probe_3_uncompressed
+v.unpack --o input=probe_3_uncompressed.pack output=probe_3_uncompressed
v.category input=probe_3_uncompressed option=report
g.remove -f type=vector name=probe_1_uncompressed,probe_2_uncompressed,probe_3_uncompressed
-rm *.pack
+#rm *.pack
Modified: grass/branches/releasebranch_7_0/vector/v.surf.bspline/test_suite/profile_cmd.sh
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.surf.bspline/test_suite/profile_cmd.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/vector/v.surf.bspline/test_suite/profile_cmd.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -1,9 +1,13 @@
# nc2008/grass7 mapset
+
+OUTFILE=callgrind.out.1196
+
g.region n=221230 s=220404 w=638634 e=639530 res=2
-CMD="v.surf.bspline in=lidar_test raster=elev.lidar_test_cubic method=bicubic -z --o"
-valgrind --tool=callgrind --trace-children=yes $CMD
+CMD="v.surf.bspline in=lidar_test raster=elev.lidar_test_cubic method=bicubic --o"
+valgrind --tool=callgrind --callgrind-out-file=$OUTFILE --trace-children=yes $CMD
-kcachegrind callgrind.out.1196
+# http://kcachegrind.sourceforge.net
+kcachegrind $OUTFILE
99% of time is spent in gmath lib's G_math_cholesky_sband_decomposition()
Modified: grass/branches/releasebranch_7_0/vector/v.surf.rst/test_suite/profile.sh
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.surf.rst/test_suite/profile.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/vector/v.surf.rst/test_suite/profile.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -1,21 +1,26 @@
# nc2008/grass7 mapset
+
+OUTFILE=callgrind.out.1196
+
g.copy vect=elev_lid792_bepts,lidar_test
v.build lidar_test
g.region n=221230 s=220816 w=639090 e=639530 res=0.5 -p
-CMD="v.surf.rst in=lidar_test -z elev=omp_test.rst --o"
+CMD="v.surf.rst in=lidar_test elev=omp_test.rst --o"
time $CMD
-valgrind --tool=callgrind --trace-children=yes $CMD
-kcachegrind callgrind.out.1196
+valgrind --tool=callgrind --callgrind-out-file=$OUTFILE --trace-children=yes $CMD
+# http://kcachegrind.sourceforge.net
+kcachegrind $OUTFILE
-x% of module time is spent in fn()
+# x% of module time is spent in fn()
- r.out.ascii omp_test.rst.g7omp6b dp=6 | md5sum
-32d2890afa57354d0d0e4a69b507e81e
+echo "expected MD5: 32d2890afa57354d0d0e4a69b507e81e"
+r.out.ascii omp_test.rst.g7omp6b dp=6 | md5sum
+exit 0
time $CMD
=========
Modified: grass/branches/releasebranch_7_0/vector/v.timestamp/test_suite/test.v.timestamp.sh
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.timestamp/test_suite/test.v.timestamp.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/vector/v.timestamp/test_suite/test.v.timestamp.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -7,7 +7,7 @@
g.region s=0 n=80 w=0 e=120 b=0 t=50 res=10 res3=10 -p3
# Lets gerenate a test map
-v.random --o seed=1 n=20 output=map
+v.random --o seed=1 npoints=20 output=map
# The first @test uses several different absolute datum formats
v.timestamp map=map date=none
@@ -62,6 +62,7 @@
v.timestamp map=map layer=3
# The third @test to check @failure with wrong time stamps
+g.message message="Now checking for expected failures due to wrong time stamps..."
v.timestamp map=map date="2 years 3 months 8 days"
v.timestamp map=map date="1 month 5 days"
v.timestamp map=map date="July 2003"
Modified: grass/branches/releasebranch_7_0/vector/v.what.rast3/test_suite/test.v.what.rast3.sh
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.what.rast3/test_suite/test.v.what.rast3.sh 2014-12-19 23:46:47 UTC (rev 63634)
+++ grass/branches/releasebranch_7_0/vector/v.what.rast3/test_suite/test.v.what.rast3.sh 2014-12-19 23:48:16 UTC (rev 63635)
@@ -8,7 +8,7 @@
# Create the volume and the sampling vector map
r3.mapcalc --o expr="plume = double(col() + row() + depth())"
# This is how the input data was created
-# v.random --o -z seed=1 output=random_points n=10 zmin=0 zmax=50
+# v.random --o -z seed=1 output=random_points npoints=10 zmin=0 zmax=50
# v.out.ascii --o format=standard input=random_points output=random_points.txt
v.in.ascii --o -z format=standard input=random_points.txt output=random_points
More information about the grass-commit
mailing list