From a8decde9e994db3828abdd65a7345affe9f27815 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 6 Jun 2022 15:41:18 +0100
Subject: [PATCH] Testing: cleanup

---
 tests/bufr_filter_extract_subsets.sh        | 1 -
 tests/bufr_filter_skipExtraKeyAttributes.sh | 1 -
 tests/bufr_filter_unpack_pack.sh            | 2 +-
 tests/bufr_split_by_rdbSubtype.sh           | 1 -
 tests/bufr_templates.sh                     | 1 -
 tests/filter_substr.sh                      | 1 -
 tests/grib2_chemicals_aerosols.sh           | 1 -
 tests/grib2_version.sh                      | 2 +-
 tests/grib3_templates.sh                    | 2 +-
 tests/grib_bitmap.sh                        | 2 +-
 tests/grib_cfNames.sh                       | 2 +-
 tests/grib_change_scanning.sh               | 1 -
 tests/grib_compare.sh                       | 2 +-
 tests/grib_dump_debug.sh                    | 2 +-
 tests/grib_ecc-1000.sh                      | 4 ++--
 tests/grib_ecc-1030.sh                      | 4 ++--
 tests/grib_ecc-1053.sh                      | 4 ++--
 tests/grib_ecc-1065.sh                      | 4 ++--
 tests/grib_ecc-1150.sh                      | 4 ++--
 tests/grib_ecc-1167.sh                      | 4 ++--
 tests/grib_ecc-1170.sh                      | 4 ++--
 tests/grib_ecc-1195.sh                      | 3 +--
 tests/grib_ecc-1212.sh                      | 3 +--
 tests/grib_ecc-1230.sh                      | 4 ++--
 tests/grib_ecc-1258.sh                      | 3 +--
 tests/grib_ecc-1260.sh                      | 4 ++--
 tests/grib_ecc-1261.sh                      | 3 +--
 tests/grib_ecc-1271.sh                      | 2 +-
 tests/grib_ecc-1315.sh                      | 4 ++--
 tests/grib_ecc-1319.sh                      | 3 +--
 tests/grib_ecc-136.sh                       | 4 ++--
 tests/grib_ecc-490.sh                       | 4 ++--
 tests/grib_ecc-600.sh                       | 4 ++--
 tests/grib_ecc-756.sh                       | 4 ++--
 tests/grib_ecc-806.sh                       | 4 ++--
 tests/grib_ecc-873.sh                       | 4 ++--
 tests/grib_ecc-922.sh                       | 4 ++--
 tests/grib_ecc-923.sh                       | 2 +-
 tests/grib_ecc-966.sh                       | 2 +-
 tests/grib_ecc-967.sh                       | 4 ++--
 tests/grib_ecc-979.sh                       | 4 ++--
 tests/grib_ecc-984.sh                       | 2 +-
 tests/grib_packing_order.sh                 | 2 +-
 tests/grib_set_force.sh                     | 2 +-
 tests/grib_suppressed.sh                    | 3 +--
 tests/grib_typeOfLevel.sh                   | 2 +-
 tests/pseudo_budg.sh                        | 2 +-
 tests/pseudo_diag.sh                        | 2 +-
 tests/wrap.sh                               | 2 +-
 49 files changed, 61 insertions(+), 74 deletions(-)

diff --git a/tests/bufr_filter_extract_subsets.sh b/tests/bufr_filter_extract_subsets.sh
index 4b8a53c53..cd64e0f9e 100755
--- a/tests/bufr_filter_extract_subsets.sh
+++ b/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
diff --git a/tests/bufr_filter_skipExtraKeyAttributes.sh b/tests/bufr_filter_skipExtraKeyAttributes.sh
index 7f2db2c82..05b435db0 100755
--- a/tests/bufr_filter_skipExtraKeyAttributes.sh
+++ b/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
diff --git a/tests/bufr_filter_unpack_pack.sh b/tests/bufr_filter_unpack_pack.sh
index d2d99077e..f2f23e939 100755
--- a/tests/bufr_filter_unpack_pack.sh
+++ b/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
diff --git a/tests/bufr_split_by_rdbSubtype.sh b/tests/bufr_split_by_rdbSubtype.sh
index a78f33c3c..5bd28151c 100755
--- a/tests/bufr_split_by_rdbSubtype.sh
+++ b/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"
diff --git a/tests/bufr_templates.sh b/tests/bufr_templates.sh
index 3c5e80e52..620cd56d9 100755
--- a/tests/bufr_templates.sh
+++ b/tests/bufr_templates.sh
@@ -10,7 +10,6 @@
 
 . ./include.ctest.sh
 
-set -u
 label="bufr_templates_test"
 
 temp=${label}.bufr
diff --git a/tests/filter_substr.sh b/tests/filter_substr.sh
index 5c9c61581..bcf29ef44 100755
--- a/tests/filter_substr.sh
+++ b/tests/filter_substr.sh
@@ -9,7 +9,6 @@
 #
 
 . ./include.ctest.sh
-set -u
 
 label="filter_substr_test"
 temp=temp.$label.txt
diff --git a/tests/grib2_chemicals_aerosols.sh b/tests/grib2_chemicals_aerosols.sh
index c817327eb..085414001 100755
--- a/tests/grib2_chemicals_aerosols.sh
+++ b/tests/grib2_chemicals_aerosols.sh
@@ -9,7 +9,6 @@
 #
 
 . ./include.ctest.sh
-set -u
 
 label="grib2_chemicals_aerosols_test"
 temp=temp.$label
diff --git a/tests/grib2_version.sh b/tests/grib2_version.sh
index e9297f0c4..14e219a30 100755
--- a/tests/grib2_version.sh
+++ b/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
diff --git a/tests/grib3_templates.sh b/tests/grib3_templates.sh
index c9599b9d7..dcc90c48f 100755
--- a/tests/grib3_templates.sh
+++ b/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"
diff --git a/tests/grib_bitmap.sh b/tests/grib_bitmap.sh
index 4965cf5ee..c773bb6fd 100755
--- a/tests/grib_bitmap.sh
+++ b/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
diff --git a/tests/grib_cfNames.sh b/tests/grib_cfNames.sh
index 8a41fce0d..11672597a 100755
--- a/tests/grib_cfNames.sh
+++ b/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
diff --git a/tests/grib_change_scanning.sh b/tests/grib_change_scanning.sh
index 8624009fb..65b4360a0 100755
--- a/tests/grib_change_scanning.sh
+++ b/tests/grib_change_scanning.sh
@@ -9,7 +9,6 @@
 #
 
 . ./include.ctest.sh
-set -u
 
 label="grib_change_scanning"
 
diff --git a/tests/grib_compare.sh b/tests/grib_compare.sh
index d9b329196..763a92351 100755
--- a/tests/grib_compare.sh
+++ b/tests/grib_compare.sh
@@ -9,7 +9,7 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 label="grib_compare_test"
 REDIRECT=/dev/null
 
diff --git a/tests/grib_dump_debug.sh b/tests/grib_dump_debug.sh
index 5f657d60a..cc84ac62e 100755
--- a/tests/grib_dump_debug.sh
+++ b/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
diff --git a/tests/grib_ecc-1000.sh b/tests/grib_ecc-1000.sh
index 016eee235..87f1123f4 100755
--- a/tests/grib_ecc-1000.sh
+++ b/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
 
diff --git a/tests/grib_ecc-1030.sh b/tests/grib_ecc-1030.sh
index 6d7061889..3655fc846 100755
--- a/tests/grib_ecc-1030.sh
+++ b/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
 
diff --git a/tests/grib_ecc-1053.sh b/tests/grib_ecc-1053.sh
index 1a8d98ea5..1517b0bd2 100755
--- a/tests/grib_ecc-1053.sh
+++ b/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
 
diff --git a/tests/grib_ecc-1065.sh b/tests/grib_ecc-1065.sh
index 2d60b3327..afd386cff 100755
--- a/tests/grib_ecc-1065.sh
+++ b/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
diff --git a/tests/grib_ecc-1150.sh b/tests/grib_ecc-1150.sh
index c03d212c6..60946c2ed 100755
--- a/tests/grib_ecc-1150.sh
+++ b/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
 
diff --git a/tests/grib_ecc-1167.sh b/tests/grib_ecc-1167.sh
index 991ef0c16..3bd4cb37f 100755
--- a/tests/grib_ecc-1167.sh
+++ b/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
diff --git a/tests/grib_ecc-1170.sh b/tests/grib_ecc-1170.sh
index 6d1212cc5..fc15a4c37 100755
--- a/tests/grib_ecc-1170.sh
+++ b/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
diff --git a/tests/grib_ecc-1195.sh b/tests/grib_ecc-1195.sh
index 2d3db3246..c5a09987a 100755
--- a/tests/grib_ecc-1195.sh
+++ b/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
diff --git a/tests/grib_ecc-1212.sh b/tests/grib_ecc-1212.sh
index d10954ab9..12cf95f2c 100755
--- a/tests/grib_ecc-1212.sh
+++ b/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
diff --git a/tests/grib_ecc-1230.sh b/tests/grib_ecc-1230.sh
index aeb7484c1..a6f91e674 100755
--- a/tests/grib_ecc-1230.sh
+++ b/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
diff --git a/tests/grib_ecc-1258.sh b/tests/grib_ecc-1258.sh
index ae46ae774..da86e0b6a 100755
--- a/tests/grib_ecc-1258.sh
+++ b/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
diff --git a/tests/grib_ecc-1260.sh b/tests/grib_ecc-1260.sh
index 2321d1fe8..23f4f5c82 100755
--- a/tests/grib_ecc-1260.sh
+++ b/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
diff --git a/tests/grib_ecc-1261.sh b/tests/grib_ecc-1261.sh
index f643f45a5..5ca60e1f7 100755
--- a/tests/grib_ecc-1261.sh
+++ b/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"
diff --git a/tests/grib_ecc-1271.sh b/tests/grib_ecc-1271.sh
index 462bcb39e..04a25d828 100755
--- a/tests/grib_ecc-1271.sh
+++ b/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
diff --git a/tests/grib_ecc-1315.sh b/tests/grib_ecc-1315.sh
index 3264f828a..81a3be7de 100755
--- a/tests/grib_ecc-1315.sh
+++ b/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
diff --git a/tests/grib_ecc-1319.sh b/tests/grib_ecc-1319.sh
index e99ee8dd7..5c6a40ccf 100755
--- a/tests/grib_ecc-1319.sh
+++ b/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
diff --git a/tests/grib_ecc-136.sh b/tests/grib_ecc-136.sh
index 549c8f884..f28120a7c 100755
--- a/tests/grib_ecc-136.sh
+++ b/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
diff --git a/tests/grib_ecc-490.sh b/tests/grib_ecc-490.sh
index b6883b639..ff0329bff 100755
--- a/tests/grib_ecc-490.sh
+++ b/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
diff --git a/tests/grib_ecc-600.sh b/tests/grib_ecc-600.sh
index 2e690dfcf..87b23e89b 100755
--- a/tests/grib_ecc-600.sh
+++ b/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
 
diff --git a/tests/grib_ecc-756.sh b/tests/grib_ecc-756.sh
index e84cdda1d..ad108a39f 100755
--- a/tests/grib_ecc-756.sh
+++ b/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
diff --git a/tests/grib_ecc-806.sh b/tests/grib_ecc-806.sh
index 74594eb9e..95707b812 100755
--- a/tests/grib_ecc-806.sh
+++ b/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
diff --git a/tests/grib_ecc-873.sh b/tests/grib_ecc-873.sh
index f150fc7d4..735a912f2 100755
--- a/tests/grib_ecc-873.sh
+++ b/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
 
diff --git a/tests/grib_ecc-922.sh b/tests/grib_ecc-922.sh
index 28ba1d0d5..c04201f65 100755
--- a/tests/grib_ecc-922.sh
+++ b/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
 
diff --git a/tests/grib_ecc-923.sh b/tests/grib_ecc-923.sh
index f3072fc89..b5c8050e6 100755
--- a/tests/grib_ecc-923.sh
+++ b/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
diff --git a/tests/grib_ecc-966.sh b/tests/grib_ecc-966.sh
index 152ce5b2e..0f7afac14 100755
--- a/tests/grib_ecc-966.sh
+++ b/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
 
diff --git a/tests/grib_ecc-967.sh b/tests/grib_ecc-967.sh
index 47e950fc1..6ecc94e46 100755
--- a/tests/grib_ecc-967.sh
+++ b/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!
diff --git a/tests/grib_ecc-979.sh b/tests/grib_ecc-979.sh
index fa69053b2..5a13923e6 100755
--- a/tests/grib_ecc-979.sh
+++ b/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
 
diff --git a/tests/grib_ecc-984.sh b/tests/grib_ecc-984.sh
index 9ebcb5ce3..49cbe7fb4 100755
--- a/tests/grib_ecc-984.sh
+++ b/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
diff --git a/tests/grib_packing_order.sh b/tests/grib_packing_order.sh
index f7d3a8f05..684874e54 100755
--- a/tests/grib_packing_order.sh
+++ b/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"
diff --git a/tests/grib_set_force.sh b/tests/grib_set_force.sh
index 98762c409..9153eb86e 100755
--- a/tests/grib_set_force.sh
+++ b/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
diff --git a/tests/grib_suppressed.sh b/tests/grib_suppressed.sh
index 0d4f0c822..c8166ebce 100755
--- a/tests/grib_suppressed.sh
+++ b/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
diff --git a/tests/grib_typeOfLevel.sh b/tests/grib_typeOfLevel.sh
index 419a51ab2..0db30515d 100755
--- a/tests/grib_typeOfLevel.sh
+++ b/tests/grib_typeOfLevel.sh
@@ -9,7 +9,7 @@
 #
 
 . ./include.ctest.sh
-set -u
+
 label="grib_typeOfLevel_test"
 temp=temp.$label.txt
 
diff --git a/tests/pseudo_budg.sh b/tests/pseudo_budg.sh
index 084291579..c4db067e8 100755
--- a/tests/pseudo_budg.sh
+++ b/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
diff --git a/tests/pseudo_diag.sh b/tests/pseudo_diag.sh
index 322abafc4..6b830be01 100755
--- a/tests/pseudo_diag.sh
+++ b/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
diff --git a/tests/wrap.sh b/tests/wrap.sh
index 6a916cd24..6f8caa1a6 100755
--- a/tests/wrap.sh
+++ b/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