Testing: renaming

tests/CMakeLists.txt

@@ -90,17 +90,17 @@ list( APPEND tests_data_reqd
     badgrib
     grib_ls
     grib_filter
-    multi
+    grib_multi
     budg
     gridType
-    octahedral
+    grib_octahedral
-    global
+    grib_global
     concept
     decimalPrecision
     bitsPerValue
     get_fail
     missing
-    local
+    grib_local
     grib_step
     grib_set
     grib_iterator

tests/Makefile.am

@@ -24,17 +24,17 @@ TESTS = definitions.sh \
         badgrib.sh \
         grib_ls.sh \
         grib_filter.sh  \
-        multi.sh \
+        grib_multi.sh \
         budg.sh \
         gridType.sh \
-        octahedral.sh \
+        grib_octahedral.sh \
-        global.sh \
+        grib_global.sh \
         concept.sh \
         decimalPrecision.sh \
         bitsPerValue.sh \
         get_fail.sh \
         missing.sh \
-        local.sh \
+        grib_local.sh \
         grib_step.sh \
         grib_set.sh \
         grib_iterator.sh \

tests/grib_multi.sh

@@ -10,13 +10,7 @@
 
 . ./include.sh
 
-if [ ! -f ${data_dir}/multi.grib2 ]
+tmpdata=grib_multi.$$.grib
-then
-  echo no data to test
-  exit 0
-fi
-
-tmpdata=grib_api.$$.grib
 rm -f $tmpdata
 
 parameterNumber=`${tools_dir}/grib_get -p parameterNumber -w parameterCategory=2,parameterNumber=3 ${data_dir}/multi.grib2`
@@ -42,4 +36,4 @@ then
   exit 1
 fi
 
-rm -f $tmpdata.1 $tmpdata.rules || true
+rm -f $tmpdata.1 $tmpdata.rules