From ba87a7eba7c05022fc46a451adbb0355931798e2 Mon Sep 17 00:00:00 2001 From: Jenny Hickson Date: Tue, 29 Aug 2023 09:30:38 +0100 Subject: [PATCH 1/3] update lfric testing instructions --- source/WorkingPractices/multi_repository.rst | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/source/WorkingPractices/multi_repository.rst b/source/WorkingPractices/multi_repository.rst index 7a8e87a2..51700c3e 100644 --- a/source/WorkingPractices/multi_repository.rst +++ b/source/WorkingPractices/multi_repository.rst @@ -97,18 +97,27 @@ these paths can either be to local changes or those in the repository. - this may be your branch from a linked ticket, or a clean trunk copy at either the last release or a suitable head of trunk revision. - 2. Update parameters.sh to point to all other code changes + 2. Update parameters.sh to point to all other code changes, e.g. .. code-block:: RST um_sources=vldXXX:/path/to/um/working/copy jules_source=vldXXX:/path/to/jules/working/copy - 3. Run test-suite + 3a. Run the lfric_atm test-suite .. code-block:: - `make test-suite` + cd lfric_atm + make test-suite + + 3b. Further testing + + If lfric_atm testing shows failures or an LFRic change is included in + the ticket then a wider set of tests should be run. This is achieved by + calling `make test-suite` from the top of your working copy. More + details on LFRic testing are found :ref:`here`. + .. tip:: From 140a79e04a2a094a7b983d589d819bc0fd10fc66 Mon Sep 17 00:00:00 2001 From: Jenny Hickson Date: Tue, 29 Aug 2023 09:34:39 +0100 Subject: [PATCH 2/3] tweak to format --- source/WorkingPractices/multi_repository.rst | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/source/WorkingPractices/multi_repository.rst b/source/WorkingPractices/multi_repository.rst index 51700c3e..4b95ffe0 100644 --- a/source/WorkingPractices/multi_repository.rst +++ b/source/WorkingPractices/multi_repository.rst @@ -108,15 +108,21 @@ these paths can either be to local changes or those in the repository. .. code-block:: - cd lfric_atm + cd /lfric_atm make test-suite - 3b. Further testing + 3b. Run the full test-suite If lfric_atm testing shows failures or an LFRic change is included in - the ticket then a wider set of tests should be run. This is achieved by - calling `make test-suite` from the top of your working copy. More - details on LFRic testing are found :ref:`here`. + the ticket then a wider set of tests should be run by launching the + test-suite from the top of your working copy. + + .. code-block:: + + cd + make test-suite + + More details on LFRic testing are found :ref:`here`. From b91ee69943a8798e4af4368a0cfb076bfaa7fa17 Mon Sep 17 00:00:00 2001 From: Jenny Hickson Date: Tue, 29 Aug 2023 09:41:30 +0100 Subject: [PATCH 3/3] making it clearer when to do what --- source/WorkingPractices/multi_repository.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/WorkingPractices/multi_repository.rst b/source/WorkingPractices/multi_repository.rst index 4b95ffe0..1e7f7f40 100644 --- a/source/WorkingPractices/multi_repository.rst +++ b/source/WorkingPractices/multi_repository.rst @@ -106,6 +106,9 @@ these paths can either be to local changes or those in the repository. 3a. Run the lfric_atm test-suite + - suitable for testing changes in other repositories that do not + include any LFRic changes + .. code-block:: cd /lfric_atm @@ -113,9 +116,8 @@ these paths can either be to local changes or those in the repository. 3b. Run the full test-suite - If lfric_atm testing shows failures or an LFRic change is included in - the ticket then a wider set of tests should be run by launching the - test-suite from the top of your working copy. + - suitable for testing LFRic changes with other repositories, or expanding + testing if lfric_atm tests have shown errors. .. code-block::