Changeset 11153


Ignore:
Timestamp:
2019-06-20T15:40:58+02:00 (16 months ago)
Author:
mathiot
Message:

add detection of local modifications in src/cfgs/test, SETTE results saved in XXXXX+ instead of XXXXX if there is differences

Location:
NEMO/branches/2019/fix_sette_ticket2239
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/fix_sette_ticket2239/README.rst

    r11140 r11153  
    1515======================= 
    1616* ``sette.sh`` is a simple wrapper that runs tests on the reference configurations, test cases and generates the report at the end. 
    17 * ``sette.sh`` is able to take a list of configurations in argument (sette.sh -t "CFG1 CFG2 CFG3").  
     17* ``sette.sh`` is able n option, to take a list of configurations in argument (sette.sh -t "CFG1 CFG2 CFG3").  
    1818       - The list of available configurations is available in running ./sette_list_avail_cfg.sh. 
    1919       - The default for sette is to run all of the reference and test configurations. 
     
    2222SECONDARY SCRIPT 
    2323================ 
    24 * ``sette_reference-configuration.sh`` runs sette tests on the reference configurations 
    25 * ``sette_test-cases.sh``              runs sette tests on test cases 
    26 * ``sette_list_avail_rev.sh``          generates a listing on all the revisions available in the validation directory for each configuration. 
     24* ``sette_reference-configuration.sh`` runs sette tests on the reference configurations. 
     25* ``sette_test-cases.sh``              runs sette tests on test cases. 
     26* ``sette_list_avail_rev.sh``          generates a listing on all the revisions available in the validation directory for each configuration.  
    2727* ``sette_list_avail_cfg.sh``          generates a listing of all the available configurations. 
    28 * ``sette_rpt.sh``                     generates the report 
     28* ``sette_rpt.sh``                     generates the report. 
    2929 
    3030USER SETUP (recommended) 
     
    8686          - if 'old' is given as argument the former behavior is applied (the latest revision is check whatever the current revision 
    8787          - it is possible to retreive all the available revision test using sette_list_avail_rev.sh 
     88          - XXXXX+ means sette results for revision XXXXX contain local modification in src/cfgs/test 
    8889          - it is NOT possible to run sette_rpt.sh for a single configuration. 
    8990* ``sette_list_avail_rev.sh`` : generate a listing on all the revisions available in the validation directory for each configuration. 
    9091          - no argument needed 
     92          - XXXXX+ means sette results for revision XXXXX contain local modification in src/cfgs/test 
    9193* ``sette_list_avail_cfg.sh`` : generate a listing of all the available configurations. 
    9294          - no argument needed 
  • NEMO/branches/2019/fix_sette_ticket2239/all_functions.sh

    r10755 r11153  
    105105    echo "value of revision number of NEMOGCM: ${REVISION_NB}" 
    106106    fi 
     107    [ `svn status -q ${SETTE_DIR}/../{cfg,tests,src} | wc -l` -ge 1 ] && REVISION_NB=${REVISION_NB}+ 
    107108    NEMO_VALID=${NEMO_VALIDATION_DIR}/W${NEW_CONF}/${CMP_NAM}/${REVISION_NB}/${TEST_NAME} 
    108109} 
  • NEMO/branches/2019/fix_sette_ticket2239/sette.sh

    r10750 r11153  
    1111 
    1212if [ $# -gt 0 ]; then 
    13   while getopts t: option; do  
     13  while getopts :ht: option; do  
    1414     case $option in 
    15         t) export SETTE_TEST_CONFIGS=$OPTARG ;; 
    16         h) echo 'sette.sh allow no arguments (all configuration will be tested or -t "CFG1_to_test CFG2_to_test ..."'; exit 42 ;; 
     15        t) export SETTE_TEST_CONFIGS=$OPTARG 
     16           echo "" 
     17           echo "Configuration $SETTE_TEST_CONFIGS will be tested if they are available" 
     18           echo "" ;; 
     19        h | *) echo 'sette.sh allow no arguments (all configuration will be tested or -t "CFG1_to_test CFG2_to_test ..."'; exit 42 ;; 
    1720     esac 
    1821  done 
  • NEMO/branches/2019/fix_sette_ticket2239/sette_list_avail_rev.sh

    r10769 r11153  
    33# 
    44lst_rev () { 
    5     CFGLST=`ls $1 | sort -u -r `  
     5    # get the list of revision available for a configuration 
     6    if [ ! -d $1 ] ; then  
     7       CFGLST=-9999 
     8    else 
     9       CFGLST=`ls $1 | sort -u -r `  
     10    fi 
     11    # config name 
    612    CONFIG=$2 
     13    # list of all revision available 
    714    ALLLST=${@:3} 
     15    # number of revision total and for CONFIG 
    816    nrevall=`echo $ALLLST | wc -w` 
    917    nrevcfg=`echo $CFGLST | wc -w` 
     18    # display 
    1019    echo "" 
    1120    printf "%-27s : " $CONFIG 
     
    1423    while [[ $irev -le $nrevall ]] ; do 
    1524       rev=`echo $ALLLST | cut -d\  -f ${irev}` 
    16        #while [[ $irevcfg -le $nrevcfg ]] ; do 
    17           cfgrev=`echo $CFGLST | cut -d\  -f ${irevcfg}` 
    18           if [[ $cfgrev -eq $rev ]] ; then 
    19              printf "%-5s  " $rev 
    20              irevcfg=$((irevcfg+1)) 
    21           else 
    22              printf "%-5s  " "*****"  
    23           fi 
    24        #done 
     25       cfgrev=`echo $CFGLST | cut -d\  -f ${irevcfg}` 
     26       if [ $cfgrev == $rev ] ; then 
     27          printf "%-6s  " $rev 
     28          irevcfg=$((irevcfg+1)) 
     29       else 
     30          printf "%-5s  " "***** "  
     31       fi 
    2532       irev=$((irev+1)) 
    2633    done 
     
    3643 # list of all revision available 
    3744 DIRLST=`find ${NEMO_VALID} -maxdepth 3 -mindepth 3 -type d | sed -e 's/.*\/W.*\///' | sort -u -r` 
    38 # DIRLST='';for dir in `find ${NEMO_VALID} -maxdepth 3 -mindepth 3 -iname [0-9][0-9][0-9][0-9][0-9]` ; do REV=`basename $dir`; DIRLST="$DIRLST $REV"; done 
    39 # DIRLST=`echo $DIRLST | grep -o -E '\w+' | sort -u -r ` 
    4045 
    41  # start checking 
     46 # display header 
    4247 echo "" 
    4348 echo " Compiler used is : $COMPILER" 
     
    4651 for dir in `echo $DIRLST`; do printf "%5s  " $dir ; done 
    4752 printf "\n" 
    48 # printf "%27s %${nrev}s" "" $DIRLST 
     53 
     54 # start checking configuration revision 
    4955 echo "" 
    5056 echo "   !---- check revision available for each configuration ----!   " 
  • NEMO/branches/2019/fix_sette_ticket2239/sette_rpt.sh

    r11140 r11153  
    451451branchname=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${MAIN_DIR} | grep ^URL | awk -F ipsl/forge/projets/nemo/svn/ '{print $NF}'` 
    452452echo "Current code is : $branchname @ r$revision  ( last change @ r$lastchange )" 
     453[ `svn status -q ${MAIN_DIR}/{cfg,tests,src} | wc -l` -ge 1 ] && lastchange=${lastchange}+ 
    453454 
    454455# overwrite revision is argument 1 present 
Note: See TracChangeset for help on using the changeset viewer.