From ce61a01d793c1eb318e217311acfc0ab8099fdd5 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Tue, 13 Jun 2017 13:11:19 +0100 Subject: [PATCH] Fix broken tests: output temp files must be uniquely named --- tests/grib1to3.sh | 5 +++-- tests/grib2to3.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/grib1to3.sh b/tests/grib1to3.sh index ae0aacf33..fb7c5193e 100755 --- a/tests/grib1to3.sh +++ b/tests/grib1to3.sh @@ -12,7 +12,8 @@ REDIRECT=/dev/null -temp=temp.grib2to3.grib3 +label="grib2to3" +temp=temp.$label.grib3 sample_g2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl ${tools_dir}/grib_set -s editionNumber=3 $sample_g2 $temp ${tools_dir}/grib_dump -O -M $temp @@ -39,7 +40,7 @@ files="constant_field\ for f in $files do file=${data_dir}/$f - output=${file}.grib3_ + output=${file}.temp.$label.grib3_ rm -f ${output} ${tools_dir}/grib_set -s editionNumber=3 ${file}.grib1 ${output} diff --git a/tests/grib2to3.sh b/tests/grib2to3.sh index 9a5c8565c..b8faf20fc 100755 --- a/tests/grib2to3.sh +++ b/tests/grib2to3.sh @@ -11,7 +11,8 @@ REDIRECT=/dev/null -temp=temp.grib1to3.grib3 +label="grib1to3" +temp=temp.$label.grib3 sample_g1=$ECCODES_SAMPLES_PATH/GRIB1.tmpl ${tools_dir}/grib_set -s editionNumber=3 $sample_g1 $temp ${tools_dir}/grib_dump -O -M $temp @@ -38,7 +39,7 @@ files="constant_field\ for f in $files do file=${data_dir}/$f - output=${file}.grib3_ + output=${file}.temp.$label.grib3_ rm -f ${output} ${tools_dir}/grib_set -s editionNumber=3 ${file}.grib2 ${output}