From b0c22a42bd5ff2ab571e843381f18d9bbcdbdda9 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Sat, 13 Mar 2021 18:24:23 +0000
Subject: [PATCH] Testing: Fix names of output temp files

---
 tests/bufr_filter_extract_subsets.sh | 21 ++++++++++-----------
 tests/bufr_filter_unpack_pack.sh     | 12 ++++++------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/tests/bufr_filter_extract_subsets.sh b/tests/bufr_filter_extract_subsets.sh
index 22c7a8900..d985b6343 100755
--- a/tests/bufr_filter_extract_subsets.sh
+++ b/tests/bufr_filter_extract_subsets.sh
@@ -21,8 +21,8 @@ fLog=${label}".log"
 rm -f $fLog
 touch $fLog
 
-# Define tmp bufr file
-fBufrTmp=${label}".bufr.tmp"
+fBufrTmp1=temp1.${label}.bufr
+fBufrTmp2=temp2.${label}.bufr
 
 # Define filter rules file
 fRules=${label}.filter
@@ -96,7 +96,7 @@ write;
 EOF
 
 f="g2nd_208.bufr"
-fOut="g2nd_208.bufr.out"
+fOut="$label.g2nd_208.bufr.out"
 
 echo "Test: extract subsets compressed data" >> $fLog
 echo "file: $f" >> $fLog
@@ -149,7 +149,7 @@ f="imssnow.bufr"
 echo "Test: Simple thinning" >> $fLog
 echo "file: $f" >> $fLog
 
-${tools_dir}/codes_bufr_filter -o ${f}.out $fRules $f
+${tools_dir}/codes_bufr_filter -o $fBufrTmp1 $fRules $f
 
 cat > $fRules <<EOF
 set unpack=1;
@@ -158,7 +158,7 @@ print "longitude=[longitude]";
 print "height=[height]";
 EOF
 
-${tools_dir}/codes_bufr_filter $fRules ${f}.out > ${f}.log
+${tools_dir}/codes_bufr_filter $fRules $fBufrTmp1 > ${f}.log
 
 cat > ${f}.log.ref <<EOF
 latitude=4.93301 5.17216 5.40243 5.62361 7.86075
@@ -168,7 +168,7 @@ EOF
 
 diff ${f}.log.ref ${f}.log 
 
-rm -f ${f}.log ${f}.log.ref ${f}.out $fLog $fRules
+rm -f ${f}.log ${f}.log.ref $fBufrTmp1 $fLog $fRules
 #-----------------------------------------------------------
 # Test: subset extraction constant values
 #-----------------------------------------------------------
@@ -186,7 +186,7 @@ f="go15_87.bufr"
 echo "Test: subset extraction constant values" >> $fLog
 echo "file: $f" >> $fLog
 
-${tools_dir}/codes_bufr_filter -o ${f}.out $fRules $f
+${tools_dir}/codes_bufr_filter -o $fBufrTmp1 $fRules $f
 
 cat > $fRules <<EOF
 set unpack=1;
@@ -196,14 +196,14 @@ set doExtractSubsets=1;
 write;
 EOF
 
-${tools_dir}/codes_bufr_filter -o ${f}.out.out $fRules ${f}.out
+${tools_dir}/codes_bufr_filter -o $fBufrTmp2 $fRules $fBufrTmp1
 
 cat > $fRules <<EOF
 set unpack=1;
 print "latitude=[latitude]";
 EOF
 
-${tools_dir}/codes_bufr_filter $fRules ${f}.out.out > ${f}.log
+${tools_dir}/codes_bufr_filter $fRules $fBufrTmp2 > ${f}.log
 
 cat > ${f}.log.ref <<EOF
 latitude=0
@@ -211,5 +211,4 @@ EOF
 diff ${f}.log.ref ${f}.log 
 
 # Clean up
-rm -f ${f}.log ${f}.log.ref ${f}.out ${f}.out.out $fLog $fRules
-rm -f ${f}.log ${f}.log.ref ${f}.out $fLog $fRules
+rm -f ${f}.log ${f}.log.ref $fBufrTmp1 $fBufrTmp2 $fLog $fRules
diff --git a/tests/bufr_filter_unpack_pack.sh b/tests/bufr_filter_unpack_pack.sh
index c3e511109..b93407931 100755
--- a/tests/bufr_filter_unpack_pack.sh
+++ b/tests/bufr_filter_unpack_pack.sh
@@ -23,6 +23,7 @@ touch $fLog
 
 # Define filter rules file
 fRules=${label}.filter
+temp=${label}.bufr
 
 cat > $fRules <<EOF
  set unpack=1;
@@ -49,13 +50,12 @@ tros_31.bufr wavb_134.bufr"
 
 
 for f in $files; do
-  echo "Test: packing $f ..." >> $fLog
-  ${tools_dir}/codes_bufr_filter -o ${f}.out $fRules $f 2>> $fLog 1>> $fLog
+  echo "Test: unpack and pack $f ..." >> $fLog
+  ${tools_dir}/codes_bufr_filter -o $temp $fRules $f 2>> $fLog 1>> $fLog
+  ${tools_dir}/bufr_compare $temp $f
 
-  ${tools_dir}/bufr_compare ${f}.out $f
-
-  rm -f ${f}.out
+  rm -f $temp
 done
 
 
-rm -f $fRules $fLog
+rm -f $fRules $fLog $temp