From 1b88bc43631671dabd902478a4000d92257adf50 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 5 Apr 2017 18:31:35 +0100
Subject: [PATCH] Testing: renaming

---
 tests/CMakeLists.txt                        |  8 ++++----
 tests/Makefile.am                           |  8 ++++----
 tests/{global.sh => grib_global.sh}         |  0
 tests/{local.sh => grib_local.sh}           |  0
 tests/{multi.sh => grib_multi.sh}           | 10 ++--------
 tests/{octahedral.sh => grib_octahedral.sh} |  0
 6 files changed, 10 insertions(+), 16 deletions(-)
 rename tests/{global.sh => grib_global.sh} (100%)
 rename tests/{local.sh => grib_local.sh} (100%)
 rename tests/{multi.sh => grib_multi.sh} (88%)
 rename tests/{octahedral.sh => grib_octahedral.sh} (100%)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d3cc30c7f..c97d2a712 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -90,17 +90,17 @@ list( APPEND tests_data_reqd
     badgrib
     grib_ls
     grib_filter
-    multi
+    grib_multi
     budg
     gridType
-    octahedral
-    global
+    grib_octahedral
+    grib_global
     concept
     decimalPrecision
     bitsPerValue
     get_fail
     missing
-    local
+    grib_local
     grib_step
     grib_set
     grib_iterator
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 24ce8814a..bd5537789 100755
--- a/tests/Makefile.am
+++ b/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 \
-        global.sh \
+        grib_octahedral.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 \
diff --git a/tests/global.sh b/tests/grib_global.sh
similarity index 100%
rename from tests/global.sh
rename to tests/grib_global.sh
diff --git a/tests/local.sh b/tests/grib_local.sh
similarity index 100%
rename from tests/local.sh
rename to tests/grib_local.sh
diff --git a/tests/multi.sh b/tests/grib_multi.sh
similarity index 88%
rename from tests/multi.sh
rename to tests/grib_multi.sh
index d21f519b8..8845faaa4 100755
--- a/tests/multi.sh
+++ b/tests/grib_multi.sh
@@ -10,13 +10,7 @@
 
 . ./include.sh
 
-if [ ! -f ${data_dir}/multi.grib2 ]
-then
-  echo no data to test
-  exit 0
-fi
-
-tmpdata=grib_api.$$.grib
+tmpdata=grib_multi.$$.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
diff --git a/tests/octahedral.sh b/tests/grib_octahedral.sh
similarity index 100%
rename from tests/octahedral.sh
rename to tests/grib_octahedral.sh