From 896a7a49c47eed4ddc018135f205968891fb2b5c Mon Sep 17 00:00:00 2001
From: Florian Rathgeber <florian.rathgeber@ecmwf.int>
Date: Fri, 3 Feb 2017 14:40:18 +0000
Subject: [PATCH] Remove trailing / from test_dir

---
 tests/grib_util_set_spec.sh | 16 ++++++++--------
 tests/include.ctest.sh.in   |  2 +-
 tests/include.sh            |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/grib_util_set_spec.sh b/tests/grib_util_set_spec.sh
index 623b94ca9..3304a9928 100755
--- a/tests/grib_util_set_spec.sh
+++ b/tests/grib_util_set_spec.sh
@@ -20,7 +20,7 @@ tempOut=temp.grib_util_set_spec.grib
 rm -f $outfile
 
 # GRIB1 with local definition for MARS. Convert to edition2 and remove local def
-${test_dir}grib_util_set_spec -e 2 -r $infile $outfile > /dev/null
+${test_dir}/grib_util_set_spec -e 2 -r $infile $outfile > /dev/null
 
 res=`${tools_dir}/grib_get -p edition,section2Used,Ni,Nj,numberOfValues,bitsPerValue $outfile`
 [ "$res" = "2 0 17 14 238 24" ]
@@ -30,22 +30,22 @@ ${tools_dir}/grib_get_data $outfile > /dev/null
 
 # Remove the local definition from input
 ${tools_dir}/grib_set -s deleteLocalDefinition=1 $infile $tempOut
-${test_dir}grib_util_set_spec $tempOut $outfile > /dev/null
+${test_dir}/grib_util_set_spec $tempOut $outfile > /dev/null
 
 # Add another grib1 local definition (which is not in grib2)
 ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=5 $infile $tempOut
 infile=$tempOut
-${test_dir}grib_util_set_spec -r -e 2 $tempOut $outfile > /dev/null
+${test_dir}/grib_util_set_spec -r -e 2 $tempOut $outfile > /dev/null
 res=`${tools_dir}/grib_get -p edition,section2Used $outfile`
 [ "$res" = "2 0" ]
 
 # GRIB2 input with local definition
 infile=../data/regular_latlon_surface.grib2
-${test_dir}grib_util_set_spec -r $infile $outfile > /dev/null
+${test_dir}/grib_util_set_spec -r $infile $outfile > /dev/null
 grib_check_key_equals $outfile section2Used 0
 # GRIB2 input without local definition
 infile=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
-${test_dir}grib_util_set_spec $infile $outfile > /dev/null
+${test_dir}/grib_util_set_spec $infile $outfile > /dev/null
 grib_check_key_equals $outfile section2Used 0
 
 # Convert to edition2 and use JPEG for packing
@@ -54,7 +54,7 @@ set +u
 if [ x"$HAVE_JPEG" != "x" ]; then
   if [ $HAVE_JPEG -eq 1 ]; then
     infile=../data/latlon.grib
-    ${test_dir}grib_util_set_spec -e 2 -p grid_jpeg $infile $outfile > /dev/null
+    ${test_dir}/grib_util_set_spec -e 2 -p grid_jpeg $infile $outfile > /dev/null
     res=`${tools_dir}/grib_get -p edition,section2Used,packingType $outfile`
     [ "$res" = "2 1 grid_jpeg" ]
   fi
@@ -71,7 +71,7 @@ rm -f $outfile
 stats_old=`${tools_dir}/grib_get -F%.2f -p min,max $infile`
 [ "$stats_old" = "160.25 224.45" ]
 
-${test_dir}grib_util_set_spec -p grid_second_order $infile $outfile
+${test_dir}/grib_util_set_spec -p grid_second_order $infile $outfile
 
 # Check output file. Values are scaled up by 1.1
 grib_check_key_equals $outfile packingType grid_second_order
@@ -89,7 +89,7 @@ fi
 infile=$ECCODES_SAMPLES_PATH/reduced_gg_pl_32_grib2.tmpl
 rm -f $outfile
 
-${test_dir}grib_util_set_spec $infile $outfile
+${test_dir}/grib_util_set_spec $infile $outfile
 grib_check_key_equals $outfile "packingType,const" "grid_simple 1"
 ${tools_dir}/grib_get_data $outfile > /dev/null
 
diff --git a/tests/include.ctest.sh.in b/tests/include.ctest.sh.in
index b636f00ea..47af59d0a 100644
--- a/tests/include.ctest.sh.in
+++ b/tests/include.ctest.sh.in
@@ -26,7 +26,7 @@ if test "x$ECCODES_TEST_WITH_VALGRIND" != "x"; then
 fi
 
 # ecCodes tests are in the PROJECT_BINARY_DIR
-test_dir=@PROJECT_BINARY_DIR@/tests/
+test_dir=@PROJECT_BINARY_DIR@/tests
 
 # use samples from binary dir to test if installation will be correct
 samp_dir="@CMAKE_BINARY_DIR@/@ECCODES_SAMPLES_SUFF@"
diff --git a/tests/include.sh b/tests/include.sh
index b0101236e..b0fc0fac8 100644
--- a/tests/include.sh
+++ b/tests/include.sh
@@ -47,7 +47,7 @@ else
 
     tigge_dir=$cpath/tigge
     data_dir=$cpath/data
-    test_dir=$cpath/tests/
+    test_dir=$cpath/tests
     def_dir=$cpath/definitions
     src_dir=$cpath/src
   else