GRIB-941: tests

tests/set.sh

@@ -53,11 +53,10 @@ centre=`${tools_dir}grib_get -p centre:l $outfile`
 [ $centre -eq 80 ]
 
 set +e
-
 ${tools_dir}grib_set -p levtype $infile $outfile 2> $REDIRECT > $REDIRECT
-
 [ $? -ne 0 ]
 
+set -e
 # GRIB-941: encoding of grib2 angles
 angleInDegrees=130.9989
 angleInMicroDegrees=130998900

tests/utils.sh

@@ -19,9 +19,9 @@ grib_check_key_equals()
 {
    file=$1
    key=$2
-   val=$3
+   expected=$3
    result=`${tools_dir}grib_get -p $key $file`
-   [ "$result" = "$val" ]
+   [ "$result" = "$expected" ]
 }
 
 grib_check_key_exists()