Changeset 9534

Timestamp:

2018-04-30T18:46:26+02:00 (6 years ago)

Author:

mathiot

Message:

correction on the check of .svn repository as since svn v1.7, .svn repository only available in the root of the working copy. Add print of last changed revision. Check revision at the root of the working copy.

Location:

branches/2017/dev_merge_2017/NEMOGCM/SETTE

Files:

• all_functions.sh (modified) (1 diff)
• sette_rpt.sh (modified) (3 diffs)

branches/2017/dev_merge_2017/NEMOGCM/SETTE/all_functions.sh

@@ -196 +196 @@
 # Creation of NEMO_VALIDATION tree
     export LANG=en_US 
-    cd ${SETTE_DIR}
-    cd ../
-    REVISION_NB=`svn info | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2`
+    REVISION_NB=`svn info ${SETTE_DIR}/../.. | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2`
     if [ ${#REVISION_NB} -eq 0 ]
     then

branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.sh

@@ -291 +291 @@
     f1o=$vdir/$nam/$mach/$dorv/$rep1/ocean.output
     if  [ ! -f $f1o ] ; then
-      printf "%-27s %s\n" $nam " ocean.output is MISSING : " $dorv
+      printf "%-27s %s %s\n" $nam " ocean.output is MISSING : " $dorv
       return;
     else 
@@ -382 +382 @@
 # Directory to run the tests
   SETTE_DIR=$(cd $(dirname "$0"); pwd)
-  MAIN_DIR=$(dirname $SETTE_DIR)
+  MAIN_DIR=$SETTE_DIR/../..
   CONFIG_DIR0=${MAIN_DIR}/CONFIG
   TOOLS_DIR=${MAIN_DIR}/TOOLS
@@ -392 +392 @@
 #
 cmd="svn"
-[ ! -d "$SETTE_DIR/.svn" ] && cmd="git $cmd"
+[ ! -d "$MAIN_DIR/.svn" ] && cmd="git $cmd"
+echo $cmd 
+echo "$MAIN_DIR/.svn"
+lastchange=`$cmd info ${MAIN_DIR} | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2`
 revision=`$cmd info | grep Revision | cut -d ":" -f 2 | tr -d ' '`
 branchname=`$cmd info | grep URL | rev | cut -d "/" -f 3 | rev`
-echo "SETTE validation report : $branchname @ r$revision"
+echo "SETTE validation report : $branchname @ r$revision  ( last change @ r$lastchange )"
 #
 # The script also needs the date or revision tag. Currently this is taken from the latest sub-directory found in each directory