Changes in Testing/Regression/FortranEtadot/run_regrtest.sh [dfa7dbd:14d9618] in flex_extract.git

File:

• Testing/Regression/FortranEtadot/run_regrtest.sh (modified) (5 diffs)

Testing/Regression/FortranEtadot/run_regrtest.sh

@@ -17 +17 @@
 exefast=calc_etadot_fast.out
 hash=$(git log --abbrev-commit --pretty=oneline -n 1  --pretty=format:'%h')
+csvfile='runtimes_'${HOST}'.csv'
 exitonfail=true
 numtest=0
@@ -32 +33 @@
 for ref in $inputs; do
 
-  echo 'Working on test case =' $ref
+  echo 'Working on test case =' $ref | tee -a ../log.run_regr
 
   # loop over debug and fast runs
@@ -62 +63 @@
         # omega case also produces fort.25 - need to add this
         outref='../Outputs/Output_ref_'${ref}'_'${exe}'/'$outfile
-        test=$(cmp  $outfile $outref)
-        if $test; then
+        if cmp -s $outfile $outref >/dev/null; then
           echo '    '$outfile '    test passed' | tee -a ../log.run_regr
         else
@@ -85 +85 @@
     user=$(echo $times | grep user | awk '{print $4}')
     sys=$( echo $times | grep sys  | awk '{print $6}')
-    echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> ../runtimes.csv
-    tail -1 ../runtimes.csv >> log.run_regr
+    echo $hash, "'"reference"'", "'"${ref}'_'${exe}"'", ${real}, ${user}, ${sys} >> ../${csvfile}
+    tail -1 ../${csvfile} >> log.run_regr
 
     cd ..
-    rm Work/* # this is for being more safe
+    rm -f Work/* # this is for being more safe
 
   done # end of exe loop
@@ -100 +100 @@
   | tee -a ../log.run_regr
 echo ' More information may be found in log.run_regr' 
-echo ' Runtimes were added to runtimes.csv under '$hash | tee -a ../log.run_regr
+echo ' Runtimes were added to '${csvfile}' under '$hash | tee -a ../log.run_regr
 
 # the following code is executed only if exitonfail is not set to 'true'.