Changeset 9534


Ignore:
Timestamp:
2018-04-30T18:46:26+02:00 (2 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/all_functions.sh

    r9220 r9534  
    196196# Creation of NEMO_VALIDATION tree 
    197197    export LANG=en_US  
    198     cd ${SETTE_DIR} 
    199     cd ../ 
    200     REVISION_NB=`svn info | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2` 
     198    REVISION_NB=`svn info ${SETTE_DIR}/../.. | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2` 
    201199    if [ ${#REVISION_NB} -eq 0 ] 
    202200    then 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.sh

    r9525 r9534  
    291291    f1o=$vdir/$nam/$mach/$dorv/$rep1/ocean.output 
    292292    if  [ ! -f $f1o ] ; then 
    293       printf "%-27s %s\n" $nam " ocean.output is MISSING : " $dorv 
     293      printf "%-27s %s %s\n" $nam " ocean.output is MISSING : " $dorv 
    294294      return; 
    295295    else  
     
    382382# Directory to run the tests 
    383383  SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    384   MAIN_DIR=$(dirname $SETTE_DIR) 
     384  MAIN_DIR=$SETTE_DIR/../.. 
    385385  CONFIG_DIR0=${MAIN_DIR}/CONFIG 
    386386  TOOLS_DIR=${MAIN_DIR}/TOOLS 
     
    392392# 
    393393cmd="svn" 
    394 [ ! -d "$SETTE_DIR/.svn" ] && cmd="git $cmd" 
     394[ ! -d "$MAIN_DIR/.svn" ] && cmd="git $cmd" 
     395echo $cmd  
     396echo "$MAIN_DIR/.svn" 
     397lastchange=`$cmd info ${MAIN_DIR} | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2` 
    395398revision=`$cmd info | grep Revision | cut -d ":" -f 2 | tr -d ' '` 
    396399branchname=`$cmd info | grep URL | rev | cut -d "/" -f 3 | rev` 
    397 echo "SETTE validation report : $branchname @ r$revision" 
     400echo "SETTE validation report : $branchname @ r$revision  ( last change @ r$lastchange )" 
    398401# 
    399402# The script also needs the date or revision tag. Currently this is taken from the latest sub-directory found in each directory 
Note: See TracChangeset for help on using the changeset viewer.