Changeset 1118

Timestamp:

10/24/14 11:38:05 (10 years ago)

Author:

sdipsl

Message:

• Avoid usage of /tmp. See #232

Location:

trunk/libIGCM

Files:

• libIGCM_card/libIGCM_card.ksh (modified) (2 diffs)
• libIGCM_date/libIGCM_date.ksh (modified) (2 diffs)
• libIGCM_debug/libIGCM_debug.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_card/libIGCM_card.ksh

@@ -315 +315 @@
 
   #---------------------
-  ${libIGCM}/libIGCM_card/IGCM_card_Test.ksh > /tmp/IGCM_card_Test.$$.ref.failed 2>&1
+  # No need to remove timestamps here
+  diff ${libIGCM}/libIGCM_debug/IGCM_card_Test.ref <(${libIGCM}/libIGCM_card/IGCM_card_Test.ksh) > /dev/null 2>&1
   status=$?
 
-  if [ ${status} -gt 0 ] ; then
-    IGCM_debug_Print 2 "IGCM_card_Test.ksh failed for some reason"
-    IGCM_debug_Print 2 "Is /tmp full?"
-    df -h
-    IGCM_debug_Print 2 "Where /tmp is pointing to?"
-    ls -l /
-  fi
-
-  if diff /tmp/IGCM_card_Test.$$.ref.failed ${libIGCM}/libIGCM_card/IGCM_card_Test.ref > /dev/null 2>&1 ; then
+  if [ ${status} -eq 0 ] ; then
     echo "Check libIGCM_card ...............................................[ OK ]"
-    rm -f /tmp/IGCM_card_Test.$$.ref.failed
   else
     echo "Check libIGCM_card ...........................................[ FAILED ]"
@@ -336 +328 @@
     echo "           diff IGCM_card_Test.ref.failed ${libIGCM}/libIGCM_card/IGCM_card_Test.ref"
     echo "           Report errors to the author: Patrick.Brockmann@cea.fr"
-    cat /tmp/IGCM_card_Test.$$.ref.failed
+    diff ${libIGCM}/libIGCM_debug/IGCM_card_Test.ref <(${libIGCM}/libIGCM_card/IGCM_card_Test.ksh)
     IGCM_debug_Exit "IGCM_card_Check"
   fi

trunk/libIGCM/libIGCM_date/libIGCM_date.ksh

@@ -1034 +1034 @@
 
   #---------------------
-  ${libIGCM}/libIGCM_date/IGCM_date_Test.ksh > /tmp/IGCM_date_Test.$$.ref.failed 2>&1
+  # No need to remove timestamps here
+  diff ${libIGCM}/libIGCM_date/IGCM_date_Test${dY}.ref <(${libIGCM}/libIGCM_date/IGCM_date_Test.ksh) > /dev/null 2>&1
   status=$?
 
-  if [ ${status} -gt 0 ] ; then
-    IGCM_debug_Print 2 "IGCM_date_Test.ksh failed for some reason"
-    IGCM_debug_Print 2 "Is /tmp full?"
-    df -h
-    IGCM_debug_Print 2 "Where /tmp is pointing to?"
-    ls -l /
-  fi
-
-  if diff /tmp/IGCM_date_Test.$$.ref.failed ${libIGCM}/libIGCM_date/IGCM_date_Test${dY}.ref > /dev/null 2>&1 ; then
+  if [ ${status} -eq 0 ] ; then
     echo "Check libIGCM_date ...............................................[ OK ]"
-    rm -f /tmp/IGCM_date_Test.$$.ref.failed
   else
     echo "Check libIGCM_date ...........................................[ FAILED ]"
@@ -1055 +1047 @@
     echo "           diff IGCM_date_Test.ref.failed ${libIGCM}/libIGCM_date/IGCM_date_Test${dY}.ref"
     echo "           Report errors to the author: Sebastien.Denvil@ipsl.jussieu.fr"
-    cat /tmp/IGCM_date_Test.$$.ref.failed
+    diff ${libIGCM}/libIGCM_date/IGCM_date_Test${dY}.ref <(${libIGCM}/libIGCM_date/IGCM_date_Test.ksh)
     IGCM_debug_Exit "IGCM_date_Check"
   fi
 }
-

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -801 +801 @@
 
   #---------------------
-  ${libIGCM}/libIGCM_debug/IGCM_debug_Test.ksh > /tmp/IGCM_debug_Test.$$.ref.failed
+  # Need to remove timestamps here
+  diff ${libIGCM}/libIGCM_debug/IGCM_debug_Test.ref <(${libIGCM}/libIGCM_debug/IGCM_debug_Test.ksh | sed -e "s:[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]\:[0-9][0-9]\:[0-9][0-9] ::g") > /dev/null 2>&1
   status=$?
 
-  if [ ${status} -gt 0 ] ; then
-    IGCM_debug_Print 2 "IGCM_debug_Test.ksh failed for some reason"
-    IGCM_debug_Print 2 "Is /tmp full?"
-    df -h
-    IGCM_debug_Print 2 "Where /tmp is pointing to?"
-    ls -l /
-  fi
-
-  # Remove date stamp.
-  sed -e "s:[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]\:[0-9][0-9]\:[0-9][0-9] ::g" /tmp/IGCM_debug_Test.$$.ref.failed > /tmp/IGCM_debug_Test.$$.ref.failed.nodate
-  mv /tmp/IGCM_debug_Test.$$.ref.failed.nodate /tmp/IGCM_debug_Test.$$.ref.failed
-
-  if diff /tmp/IGCM_debug_Test.$$.ref.failed ${libIGCM}/libIGCM_debug/IGCM_debug_Test.ref > /dev/null 2>&1 ; then
+  if [ ${status} -eq 0 ] ; then
     echo "Check libIGCM_debug ..............................................[ OK ]"
-    rm -f /tmp/IGCM_debug_Test.$$.ref.failed
   else
     echo "Check libIGCM_debug ..........................................[ FAILED ]"
@@ -826 +814 @@
     echo "           diff IGCM_debug_Test.ref.failed ${libIGCM}/libIGCM_debug/IGCM_debug_Test.ref"
     echo "           Report errors to the author: Patrick.Brockmann@cea.fr"
-    cat /tmp/IGCM_debug_Test.$$.ref.failed
+    diff ${libIGCM}/libIGCM_debug/IGCM_debug_Test.ref <(${libIGCM}/libIGCM_debug/IGCM_debug_Test.ksh | sed -e "s:[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]\:[0-9][0-9]\:[0-9][0-9] ::g")
     exit 4
   fi