modif du choix des commandes

[tools/eficas.git] / Aster / lance_test.sh

diff --git a/Aster/lance_test.sh b/Aster/lance_test.sh
index 46c2c2b5237990a90db9eaaa2a25e509b6954aab..743c70beb936b22adc56571184f127e4549bbd8c 100755 (executable)
--- a/Aster/lance_test.sh
+++ b/Aster/lance_test.sh
@@ -1,38 +1,43 @@
 #unalias do
 #set -x
-version=V8
+version=NEW9
 passe=1
-rm -rf ./Tests_Batch/${version}/ok_${passe}
-rm -rf ./Tests_Batch/${version}/bad_${passe}
-rm -rf ./Tests_Batch/${version}/nt_${passe}
-for file in `cat ./Tests_Batch/${version}/aTester`
+rm -rf ./Batch/${version}/ok_${passe}
+rm -rf ./Batch/${version}/bad_${passe} 
+rm -rf ./Batch/${version}/badfile_${passe}
+rm -rf ./Batch/${version}/nt_${passe}
+for file in `cat ./Batch/${version}/aTester`
 do
         echo $file
-       grep "VISU_EFICAS='NON'" $file > /dev/null 2>/dev/null
-       rc=$?
-       if [ "$rc" != "0" ]
-       then
-           grep INCLUDE $file | grep -v "#" | grep -v INCLUDE_MATERIAU > /dev/null 2>/dev/null
-           rc=$?
-           if  [ "$rc" != "0" ]
-           then
-               cr=`./test_eficas.py $file` 
-               if [ "${cr}" == "" ]
-               then
-                 echo $file >> ./Tests_Batch/${version}/bad_${passe}
-               else
-                 cr=` echo $cr | grep -v DEBUT | grep -v FIN`
-                 if [ "${cr}" != "" ]
-                 then
-                       echo $file >> ./Tests_Batch/${version}/bad_${passe}
-                 else
-                       echo $file >> ./Tests_Batch/${version}/ok_${passe}
-                 fi
-               fi
-           else
-             echo $file >> ./Tests_Batch/${version}/nt_${passe}
-           fi
-       else
-          echo $file >> ./Tests_Batch/${version}/nt_${passe}
-       fi 
+        grep "VISU_EFICAS='NON'" $file > /dev/null 2>/dev/null
+        rc=$?
+        if [ "$rc" != "0" ]
+        then
+            grep INCLUDE $file | grep -v "#" | grep -v INCLUDE_MATERIAU > /dev/null 2>/dev/null
+            rc=$?
+            if  [ "$rc" != "0" ]
+            then
+                     cr=`./test_eficas.py $file` 
+                if [ "${cr}" == "" ]
+                then
+                  echo $file >> ./Batch/${version}/bad_${passe}
+                else
+                  nomfeuille=`basename $file`
+                  boncr="DEBUT CR validation : "${nomfeuille}" FIN CR validation :"${nomfeuille}
+                  cr=`echo $cr`
+                  if [ "${cr}" != "$boncr" ]
+                  then
+                        echo $file >> ./Batch/${version}/bad_${passe}
+                        echo $cr >>./Batch/${version}/bad_${passe}
+                        echo $file >>./Batch/${version}/badfile_${passe}
+                  else
+                        echo $file >> ./Batch/${version}/ok_${passe}
+                  fi
+                fi
+            else
+              echo $file >> ./Batch/${version}/nt_${passe}
+            fi
+        else
+           echo $file >> ./Batch/${version}/nt_${passe}
+        fi 
 done