Changeset 13622 for branches/NERC

Timestamp:

2020-10-16T15:11:34+02:00 (4 years ago)

Author:

smueller

Message:

MEDUSA-specific extension of the test for local working-copy modifications in SETTE

Location:

branches/NERC/dev_sette_NERC

Files:

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

branches/NERC/dev_sette_NERC/all_functions.sh

@@ -105 +105 @@
     echo "value of revision number of NEMOGCM: ${REVISION_NB}"
     fi
-    [ `${SVN_CMD} status -q ${SETTE_DIR}/../{cfg,tests,src} | wc -l` -ge 1 ] && REVISION_NB=${REVISION_NB}+
+    # detect local modifications (one MEDUSA-specific exception)
+    [ `${SVN_CMD} status -q ${SETTE_DIR}/../{cfg,tests,src,src/TOP/MEDUSA,cfgs/SHARED_MEDUSA,cfgs/ORCA2_MEDUSA} | grep -v '~       ../tests/BENCH/EXPREF/namelist_top_cfg' | wc -l` -ge 1 ] && REVISION_NB=${REVISION_NB}+
     NEMO_VALID=${NEMO_VALIDATION_DIR}/W${NEW_CONF}/${CMP_NAM}/${REVISION_NB}/${TEST_NAME}
 }

branches/NERC/dev_sette_NERC/sette_rpt.sh

@@ -438 +438 @@
 branchname=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${MAIN_DIR} | grep ^URL | awk -F ipsl/forge/projets/nemo/svn/ '{print $NF}'`
 echo "Current code is : $branchname @ r$revision  ( last change @ r$lastchange )"
-[ `${SVN_CMD} status -q ${MAIN_DIR}/{cfg,tests,src} | wc -l` -ge 1 ] && lastchange=${lastchange}+
+# detect local modifications (one MEDUSA-specific exception)
+[ `${SVN_CMD} status -q ${MAIN_DIR}/{cfg,tests,src,src/TOP/MEDUSA,cfgs/SHARED_MEDUSA,cfgs/ORCA2_MEDUSA} | grep -v '~       ../tests/BENCH/EXPREF/namelist_top_cfg' | wc -l` -ge 1 ] && lastchange=${lastchange}+
 
 # overwrite revision is argument 1 present