From 3e351deda5a0340f464e211c61fc73dbf7c9bd4d Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 24 Oct 2016 14:55:53 +0100
Subject: [PATCH] Tests: ensure temp files are uniquely named

---
 tests/bitmap.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/bitmap.sh b/tests/bitmap.sh
index 215eaeac8..62cb1e281 100755
--- a/tests/bitmap.sh
+++ b/tests/bitmap.sh
@@ -8,7 +8,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-
 . ./include.sh
 
 REDIRECT=/dev/null
@@ -19,7 +18,7 @@ infile=${data_dir}/reduced_gaussian_model_level.grib1
 outfile=${data_dir}/with_bitmap.grib1
 outfile1=${data_dir}/without_bitmap.grib1
 
-rm -f $outfile || true
+rm -f $outfile
 
 ${tools_dir}grib_set -s bitmapPresent=1 $infile $outfile >$REDIRECT
 
@@ -49,15 +48,14 @@ set values={1,2,3,4,5,6,7,1111,1111,8,9,10};
 write ;
 EOF
 
-${tools_dir}grib_filter -o out.grib1 bitmap.rules $grib1 
-${tools_dir}grib_filter -o out.grib2 bitmap.rules $grib2
+${tools_dir}grib_filter -o out.bmp.grib1 bitmap.rules $grib1 
+${tools_dir}grib_filter -o out.bmp.grib2 bitmap.rules $grib2
 #exit 0
 
-${tools_dir}grib_get_data -m missing out.grib1 > out.grib1.data
-${tools_dir}grib_get_data -m missing out.grib2 > out.grib2.data
+${tools_dir}grib_get_data -m missing out.bmp.grib1 > out.bmp.grib1.data
+${tools_dir}grib_get_data -m missing out.bmp.grib2 > out.bmp.grib2.data
 
-diff out.grib1.data out.grib2.data
-
-rm -f  out.grib1.data out.grib2.data out.grib1 out.grib2 bitmap.rules
+diff out.bmp.grib1.data out.bmp.grib2.data
 
+rm -f  out.bmp.grib1.data out.bmp.grib2.data out.bmp.grib1 out.bmp.grib2 bitmap.rules