From 1f737e3909a3c510bf79de321f6e8d66fad11bdd Mon Sep 17 00:00:00 2001 From: gforney Date: Thu, 20 Aug 2020 15:04:56 -0400 Subject: [PATCH 1/2] FDS vv: add message on how to run with dirty validation input files --- Validation/Common_Run_All.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Validation/Common_Run_All.sh b/Validation/Common_Run_All.sh index 5a13e9cf66e..648a9601ea8 100755 --- a/Validation/Common_Run_All.sh +++ b/Validation/Common_Run_All.sh @@ -173,7 +173,8 @@ if [ ! $STOPFDS ] ; then if [ "$CHECK_DIRTY" != "" ]; then ndiffs=`git diff --shortstat FDS_Input_Files/*.fds | wc -l` if [ $ndiffs -gt 0 ]; then - echo "***error: One or more input files are dirty" + echo "***error: One or more input files are dirty." + echo " Use the -g option to run anyway." git status -uno | grep FDS_Input_Files | grep -v \/FDS_Input_Files echo "Exiting." exit 1 From d16944818b0ae1ca14bdb86e5d0c94028a332e7d Mon Sep 17 00:00:00 2001 From: gforney Date: Thu, 20 Aug 2020 16:17:13 -0400 Subject: [PATCH 2/2] FDS vv: check for dirty source files before running validation cases --- Validation/Common_Run_All.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Validation/Common_Run_All.sh b/Validation/Common_Run_All.sh index 648a9601ea8..739b8df950f 100755 --- a/Validation/Common_Run_All.sh +++ b/Validation/Common_Run_All.sh @@ -170,12 +170,26 @@ fi # abort if repo is dirty if [ ! $STOPFDS ] ; then + ABORT= if [ "$CHECK_DIRTY" != "" ]; then ndiffs=`git diff --shortstat FDS_Input_Files/*.fds | wc -l` + nsourcediffs=`git diff --shortstat ../../Source/*.f90 | wc -l` if [ $ndiffs -gt 0 ]; then + echo "" echo "***error: One or more input files are dirty." - echo " Use the -g option to run anyway." git status -uno | grep FDS_Input_Files | grep -v \/FDS_Input_Files + ABORT=1 + fi + if [ $nsourcediffs -gt 0 ]; then + echo "" + echo "***error: One or more source files are dirty." + cd ../.. + git status -uno | grep Source + ABORT=1 + fi + if [ "$ABORT" == "1" ]; then + echo "" + echo "Use the -g option to run anyway." echo "Exiting." exit 1 fi