Testing: cleanup

tests/bufr_filter_extract_subsets.sh

@@ -10,7 +10,6 @@
 
 . ./include.ctest.sh
 
-set -u
 cd ${data_dir}/bufr
 
 # Define a common label for all the tmp files

tests/bufr_filter_skipExtraKeyAttributes.sh

@@ -10,7 +10,6 @@
 
 . ./include.ctest.sh
 
-set -u
 cd ${data_dir}/bufr
 
 # Define a common label for all the tmp files

tests/bufr_filter_unpack_pack.sh

@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-set -u
+
 cd ${data_dir}/bufr
 
 # Define a common label for all the tmp files

tests/bufr_split_by_rdbSubtype.sh

@@ -9,7 +9,6 @@
 #
 
 . ./include.ctest.sh
-set -u
 
 # Define a common label for all the tmp files
 label="bufr_split_by_rdbSubtype"

tests/bufr_templates.sh

@@ -10,7 +10,6 @@
 
 . ./include.ctest.sh
 
-set -u
 label="bufr_templates_test"
 
 temp=${label}.bufr

tests/filter_substr.sh

@@ -9,7 +9,6 @@
 #
 
 . ./include.ctest.sh
-set -u
 
 label="filter_substr_test"
 temp=temp.$label.txt

tests/grib2_chemicals_aerosols.sh

@@ -9,7 +9,6 @@
 #
 
 . ./include.ctest.sh
-set -u
 
 label="grib2_chemicals_aerosols_test"
 temp=temp.$label

tests/grib2_version.sh

@@ -8,7 +8,7 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 . ./include.ctest.sh
-set -u
+
 
 label="grib2_version"
 if [ ! -d "$ECCODES_DEFINITION_PATH" ]; then

tests/grib3_templates.sh

@@ -8,7 +8,7 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 . ./include.ctest.sh
-set -u
+
 REDIRECT=/dev/null
 
 label="grib3_templates"

tests/grib_bitmap.sh

@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 
 REDIRECT=/dev/null
-set -u
+
 grib1=${data_dir}/regular_latlon_surface.grib1
 grib2=${data_dir}/regular_latlon_surface.grib2
 infile=${data_dir}/reduced_gaussian_model_level.grib1

tests/grib_cfNames.sh

@@ -9,7 +9,7 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 label="grib_cfNames_test"
 temp=temp.${label}
 sample1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl

tests/grib_change_scanning.sh

@@ -9,7 +9,6 @@
 #
 
 . ./include.ctest.sh
-set -u
 
 label="grib_change_scanning"
 

tests/grib_compare.sh

@@ -9,7 +9,7 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 label="grib_compare_test"
 REDIRECT=/dev/null
 

tests/grib_dump_debug.sh

@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 label="grib_dump_debug"
 temp=temp.$label.txt
-set -u
+
 REDIRECT=/dev/null
 
 if [ $HAVE_MEMFS -eq 1 ]; then

tests/grib_ecc-1000.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-1000
 # Nearest neighbour using grib_get/grib_ls on severa files
 # ---------------------------------------------------------
-label="grib_ecc-1000-test"
+label="grib_ecc-1000_test"
 tempOut=temp.${label}.out
 tempRef=temp.${label}.ref
 

tests/grib_ecc-1030.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-1030
 # grib_get with the ordering option '-B'
 # ---------------------------------------------------------
-label="grib_ecc-1030-test"
+label="grib_ecc-1030_test"
 tempRef=temp.${label}.ref
 tempOut=temp.${label}.out
 

tests/grib_ecc-1053.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-1053
 # It tests the human readable step key
 # ---------------------------------------------------------
-label="grib_ecc-1053-test"
+label="grib_ecc-1053_test"
 temp=temp.${label}.grib
 sample_g1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
 

tests/grib_ecc-1065.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-1065
 # It tests the power operator
 # ---------------------------------------------------------
-label="grib_ecc-1065-test"
+label="grib_ecc-1065_test"
 tempRules=temp.${label}.filter
 
 cat > $tempRules <<EOF

tests/grib_ecc-1150.sh

@@ -9,13 +9,13 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-1150
 # ECC-1150: keys 'lowerLimit' & 'upperLimit' cannot be MISSING
 # See also ECC-1286
 # ---------------------------------------------------------
-label="grib_ecc-1150-test"
+label="grib_ecc-1150_test"
 tempGrib=temp.${label}.grib
 tempFilt=temp.${label}.filt
 

tests/grib_ecc-1167.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-1167
 # GRIB: Allow setting byte array as string
 # ---------------------------------------------------------
-label="grib_ecc-1167-test"
+label="grib_ecc-1167_test"
 temp1=temp.${label}.1.grib
 temp2=temp.${label}.2.grib
 errlog=temp.${label}.err

tests/grib_ecc-1170.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-1170
 # grib_filter: Fail if key of type double (e.g. values) is assigned to a string
 # ---------------------------------------------------------
-label="grib_ecc-1170-test"
+label="grib_ecc-1170_test"
 
 tempErr=temp.${label}.err
 tempFilt=temp.${label}.filt

tests/grib_ecc-1195.sh

@@ -9,9 +9,8 @@
 #
 
 . ./include.ctest.sh
-set -u
 
-label="grib_ecc-1195-test"
+label="grib_ecc-1195_test"
 temp1=temp.$label.grib
 temp2=temp.$label.txt
 sample_grib1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl

tests/grib_ecc-1212.sh

@@ -9,9 +9,8 @@
 #
 
 . ./include.ctest.sh
-set -u
 
-label="grib_ecc-1212-test"
+label="grib_ecc-1212_test"
 tempGrib=temp.$label.grib
 tempFilt=temp.$label.filt
 tempOut=temp.$label.out

tests/grib_ecc-1230.sh

@@ -9,9 +9,9 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 REDIRECT=/dev/null
-label="prod_ECC-1230-test"
+label="prod_ECC-1230_test"
 temp1=temp1.$label
 temp2=temp2.$label
 sample_grib1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl

tests/grib_ecc-1258.sh

@@ -9,9 +9,8 @@
 #
 
 . ./include.ctest.sh
-set -u
 
-label="grib_ecc-1258-test"
+label="grib_ecc-1258_test"
 tempFilt=temp.$label.filt
 tempGrib=temp.$label.grib
 tempOut=temp.$label.txt

tests/grib_ecc-1260.sh

@@ -9,9 +9,9 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 REDIRECT=/dev/null
-label="grib_ecc-1260-test"
+label="grib_ecc-1260_test"
 tempGrib=temp.$label.grib
 tempRef=temp.$label.ref
 tempOut=temp.$label.txt

tests/grib_ecc-1261.sh

@@ -9,9 +9,8 @@
 #
 
 . ./include.ctest.sh
-set -u
 
-label="grib_ecc-1261-test"
+label="grib_ecc-1261_test"
 
 tempFilt="temp.${label}.filt"
 tempGrib="temp.${label}.grib"

tests/grib_ecc-1271.sh

@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_ecc-1271-test"
+label="grib_ecc-1271_test"
 temp=temp.$label
 
 sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl

tests/grib_ecc-1315.sh

@@ -9,9 +9,9 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 REDIRECT=/dev/null
-label="grib_ecc-1313-test"
+label="grib_ecc-1313_test"
 tempOut=temp.$label.text
 tempRef=temp.$label.ref
 tempFilt=temp.$label.filt

tests/grib_ecc-1319.sh

@@ -9,9 +9,8 @@
 #
 
 . ./include.ctest.sh
-set -u
 
-label="grib_ecc-1319-test"
+label="grib_ecc-1319_test"
 
 temp=temp.$label.grib
 temp1=temp1.$label.grib

tests/grib_ecc-136.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-136.
 # grib_compare ignores difference in indicatorOfTypeOfLevel
 # ---------------------------------------------------------
-label="grib_ecc-136-test"
+label="grib_ecc-136_test"
 temp1=temp1.${label}
 temp2=temp2.${label}
 sample1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl

tests/grib_ecc-490.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-490.
 # It tests changing GRIB templates
 # ---------------------------------------------------------
-label="grib_ecc-490-test"
+label="grib_ecc-490_test"
 tempSample=temp.${label}.sample.grib
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.grib

tests/grib_ecc-600.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-600.
 # Nearest neighbour for rotated lat/lon grids.
 # ---------------------------------------------------------
-label="grib_ecc-600-test"
+label="grib_ecc-600_test"
 tempOut=temp.${label}.out
 tempGrib=temp.${label}.grib
 

tests/grib_ecc-756.sh

@@ -9,13 +9,13 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-756
 # It tests computing the number of points for Reduced
 # Gaussians grids
 # ---------------------------------------------------------
-label="grib_ecc-756-test"
+label="grib_ecc-756_test"
 tempSample=temp.${label}.sample.grib
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.grib

tests/grib_ecc-806.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # --------------------------------------------
 # This is the test for the JIRA issue ECC-806
 # Local definitions precedence order
 # --------------------------------------------
-label="grib_ecc-806-test"
+label="grib_ecc-806_test"
 tempGrb=temp.${label}.grb
 tempOut=temp.${label}.txt
 tempErr=temp.${label}.err

tests/grib_ecc-873.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-873.
 # It tests grib_ls with the ordering option '-B'
 # ---------------------------------------------------------
-label="grib_ecc-873-test"
+label="grib_ecc-873_test"
 tempRef=temp.${label}.ref
 tempOut=temp.${label}.out
 

tests/grib_ecc-922.sh

@@ -9,14 +9,14 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-922
 # grib_get_data should fail on incorrectly coded grid
 # ---------------------------------------------------------
 
 REDIRECT=/dev/null
-label="grib_ecc-922-test"
+label="grib_ecc-922_test"
 temp=temp.$label
 sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
 

tests/grib_ecc-923.sh

@@ -14,7 +14,7 @@ set -u
 # This is the test for the JIRA issue ECC-923.
 # Mismatched count not reported as difference by grib_compare
 # ---------------------------------------------------------
-label="grib_ecc-923-test"
+label="grib_ecc-923_test"
 tempOut=temp.${label}.out
 tempGrib1=temp.1.${label}.grib
 tempGrib2=temp.2.${label}.grib

tests/grib_ecc-966.sh

@@ -14,7 +14,7 @@ set -u
 # This is the test for the JIRA issue ECC-966.
 # Crash: setting shapeOfTheEarth=1 but scale factor missing
 # ---------------------------------------------------------
-label="grib_ecc-966-test"
+label="grib_ecc-966_test"
 tempGrib=temp.${label}.grib
 tempErrs=temp.${label}.errs
 

tests/grib_ecc-967.sh

@@ -9,12 +9,12 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-967.
 # GRIB2: Fallback if tables version > latest installed version
 # ---------------------------------------------------------
-label="grib_ecc-967-test"
+label="grib_ecc-967_test"
 temp=temp.${label}.grib
 
 # Pick a master tables version number way to big!

tests/grib_ecc-979.sh

@@ -9,13 +9,13 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 # ---------------------------------------------------------
 # This is the test for the JIRA issue ECC-979.
 # Directly setting keys that use the accessor
 #   from_scale_factor_scaled_value
 # ---------------------------------------------------------
-label="grib_ecc-979-test"
+label="grib_ecc-979_test"
 temp=temp.${label}
 sample2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
 

tests/grib_ecc-984.sh

@@ -14,7 +14,7 @@ set -u
 # This is the test for the JIRA issue ECC-984
 # grib_get_data: missing jDirectionIncrement produces huge values
 # ---------------------------------------------------------
-label="grib_ecc-984-test"
+label="grib_ecc-984_test"
 tempGrb=temp.${label}.grb
 tempOut=temp.${label}.txt
 tempErr=temp.${label}.err

tests/grib_packing_order.sh

@@ -9,7 +9,7 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 REDIRECT=/dev/null
 label="grib_packing_order"
 temp=${label}".grib.tmp"

tests/grib_set_force.sh

@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 
 REDIRECT=/dev/null
-set -u
+
 label="grib_set_force_test"
 
 tempInput=temp.$label.input.grib2

tests/grib_suppressed.sh

@@ -9,9 +9,8 @@
 #
 
 . ./include.ctest.sh
-set -u
 
-label="grib_suppressed-test"
+label="grib_suppressed_test"
 
 tempErr=temp.${label}.err
 tempFilt=temp.${label}.filt

tests/grib_typeOfLevel.sh

@@ -9,7 +9,7 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 label="grib_typeOfLevel_test"
 temp=temp.$label.txt
 

tests/pseudo_budg.sh

@@ -12,7 +12,7 @@
 . ./include.ctest.sh
 
 label="pseudo_budg_test"
-set -u
+
 tempOut=temp.$label.txt
 tempRef=temp.$label.ref
 tempBud=temp.$label.bud

tests/pseudo_diag.sh

@@ -11,7 +11,7 @@
 # Tests for Pseudo-GRIB format "DIAG"
 
 . ./include.ctest.sh
-label="pseudo-diag-test"
+label="pseudo_diag_test"
 tempOut=temp.${label}.out
 tempTxt=temp.${label}.txt
 tempRef=temp.${label}.ref

tests/wrap.sh

@@ -11,7 +11,7 @@
 # Tests for WRAP
 
 . ./include.ctest.sh
-label="wrap-test"
+label="wrap_test"
 tempOut=temp.${label}.out
 tempTxt=temp.${label}.txt
 tempRef=temp.${label}.ref