core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove trailing / from test_dir

This commit is contained in:
Florian Rathgeber 2017-02-03 14:40:18 +00:00
parent fad6f076d7
commit 896a7a49c4
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/grib_util_set_spec.sh
View File

@ -20,7 +20,7 @@ tempOut=temp.grib_util_set_spec.grib
rm -f $outfile rm -f $outfile
# GRIB1 with local definition for MARS. Convert to edition2 and remove local def # GRIB1 with local definition for MARS. Convert to edition2 and remove local def
${test_dir}grib_util_set_spec -e 2 -r $infile $outfile > /dev/null ${test_dir}/grib_util_set_spec -e 2 -r $infile $outfile > /dev/null
res=`${tools_dir}/grib_get -p edition,section2Used,Ni,Nj,numberOfValues,bitsPerValue $outfile` res=`${tools_dir}/grib_get -p edition,section2Used,Ni,Nj,numberOfValues,bitsPerValue $outfile`
[ "$res" = "2 0 17 14 238 24" ] [ "$res" = "2 0 17 14 238 24" ]
@ -30,22 +30,22 @@ ${tools_dir}/grib_get_data $outfile > /dev/null
# Remove the local definition from input # Remove the local definition from input
${tools_dir}/grib_set -s deleteLocalDefinition=1 $infile $tempOut ${tools_dir}/grib_set -s deleteLocalDefinition=1 $infile $tempOut
${test_dir}grib_util_set_spec $tempOut $outfile > /dev/null ${test_dir}/grib_util_set_spec $tempOut $outfile > /dev/null
# Add another grib1 local definition (which is not in grib2) # Add another grib1 local definition (which is not in grib2)
${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=5 $infile $tempOut ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=5 $infile $tempOut
infile=$tempOut infile=$tempOut
${test_dir}grib_util_set_spec -r -e 2 $tempOut $outfile > /dev/null ${test_dir}/grib_util_set_spec -r -e 2 $tempOut $outfile > /dev/null
res=`${tools_dir}/grib_get -p edition,section2Used $outfile` res=`${tools_dir}/grib_get -p edition,section2Used $outfile`
[ "$res" = "2 0" ] [ "$res" = "2 0" ]
# GRIB2 input with local definition # GRIB2 input with local definition
infile=../data/regular_latlon_surface.grib2 infile=../data/regular_latlon_surface.grib2
${test_dir}grib_util_set_spec -r $infile $outfile > /dev/null ${test_dir}/grib_util_set_spec -r $infile $outfile > /dev/null
grib_check_key_equals $outfile section2Used 0 grib_check_key_equals $outfile section2Used 0
# GRIB2 input without local definition # GRIB2 input without local definition
infile=$ECCODES_SAMPLES_PATH/GRIB2.tmpl infile=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
${test_dir}grib_util_set_spec $infile $outfile > /dev/null ${test_dir}/grib_util_set_spec $infile $outfile > /dev/null
grib_check_key_equals $outfile section2Used 0 grib_check_key_equals $outfile section2Used 0
# Convert to edition2 and use JPEG for packing # Convert to edition2 and use JPEG for packing
@ -54,7 +54,7 @@ set +u
if [ x"$HAVE_JPEG" != "x" ]; then if [ x"$HAVE_JPEG" != "x" ]; then
if [ $HAVE_JPEG -eq 1 ]; then if [ $HAVE_JPEG -eq 1 ]; then
infile=../data/latlon.grib infile=../data/latlon.grib
${test_dir}grib_util_set_spec -e 2 -p grid_jpeg $infile $outfile > /dev/null ${test_dir}/grib_util_set_spec -e 2 -p grid_jpeg $infile $outfile > /dev/null
res=`${tools_dir}/grib_get -p edition,section2Used,packingType $outfile` res=`${tools_dir}/grib_get -p edition,section2Used,packingType $outfile`
[ "$res" = "2 1 grid_jpeg" ] [ "$res" = "2 1 grid_jpeg" ]
fi fi
@ -71,7 +71,7 @@ rm -f $outfile
stats_old=`${tools_dir}/grib_get -F%.2f -p min,max $infile` stats_old=`${tools_dir}/grib_get -F%.2f -p min,max $infile`
[ "$stats_old" = "160.25 224.45" ] [ "$stats_old" = "160.25 224.45" ]
${test_dir}grib_util_set_spec -p grid_second_order $infile $outfile ${test_dir}/grib_util_set_spec -p grid_second_order $infile $outfile
# Check output file. Values are scaled up by 1.1 # Check output file. Values are scaled up by 1.1
grib_check_key_equals $outfile packingType grid_second_order grib_check_key_equals $outfile packingType grid_second_order
@ -89,7 +89,7 @@ fi
infile=$ECCODES_SAMPLES_PATH/reduced_gg_pl_32_grib2.tmpl infile=$ECCODES_SAMPLES_PATH/reduced_gg_pl_32_grib2.tmpl
rm -f $outfile rm -f $outfile
${test_dir}grib_util_set_spec $infile $outfile ${test_dir}/grib_util_set_spec $infile $outfile
grib_check_key_equals $outfile "packingType,const" "grid_simple 1" grib_check_key_equals $outfile "packingType,const" "grid_simple 1"
${tools_dir}/grib_get_data $outfile > /dev/null ${tools_dir}/grib_get_data $outfile > /dev/null

2
tests/include.ctest.sh.in
View File

@ -26,7 +26,7 @@ if test "x$ECCODES_TEST_WITH_VALGRIND" != "x"; then
fi fi
# ecCodes tests are in the PROJECT_BINARY_DIR # ecCodes tests are in the PROJECT_BINARY_DIR
test_dir=@PROJECT_BINARY_DIR@/tests/ test_dir=@PROJECT_BINARY_DIR@/tests
# use samples from binary dir to test if installation will be correct # use samples from binary dir to test if installation will be correct
samp_dir="@CMAKE_BINARY_DIR@/@ECCODES_SAMPLES_SUFF@" samp_dir="@CMAKE_BINARY_DIR@/@ECCODES_SAMPLES_SUFF@"

2
tests/include.sh
View File

@ -47,7 +47,7 @@ else
tigge_dir=$cpath/tigge tigge_dir=$cpath/tigge
data_dir=$cpath/data data_dir=$cpath/data
test_dir=$cpath/tests/ test_dir=$cpath/tests
def_dir=$cpath/definitions def_dir=$cpath/definitions
src_dir=$cpath/src src_dir=$cpath/src
else else