Tweak the display of submod head commits for GCHP int tests

test/shared/commonFunctionsForTests.sh - Remove "_GridComp" from the "FVdycoreCubed" submodule display name in function print_submodule_head_commits test/integration/GCHP/integrationTestCompile.sh test/integration/GCHP/integrationTestCreate.sh test/integration/GCHP/integrationTestExecute.sh - Now use an offset of 14 characters for print_submodule_head_commits Signed-off-by: Bob Yantosca <[email protected]>
geoschem · Jul 26, 2024 · 1f97c9e · 1f97c9e
1 parent 866a7c0
commit 1f97c9e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/test/integration/GCHP/integrationTestCompile.sh b/test/integration/GCHP/integrationTestCompile.sh
@@ -125,7 +125,7 @@ rm -f "${results}"
 print_to_log "${SEP_MAJOR}"                               "${results}"
 print_to_log "GCHP: Compilation Test Results"             "${results}"
 print_to_log ""                                           "${results}"
-print_submodule_head_commits "15" "${codeDir}"            "${results}"
+print_submodule_head_commits "14" "${codeDir}"            "${results}"
 print_to_log ""                                           "${results}"
 print_to_log "Number of compilation tests: ${numTests}"   "${results}"
 print_to_log ""                                           "${results}"

diff --git a/test/integration/GCHP/integrationTestCreate.sh b/test/integration/GCHP/integrationTestCreate.sh
@@ -76,9 +76,9 @@ geosChemDir="${superProjectDir}/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem"
 # Echo header
 printf "${SEP_MAJOR}\n"
 printf "Creating GCHP Integration Tests\n\n"
-print_submodule_head_commits "10" "${superProjectDir}" ""
+print_submodule_head_commits "14" "${superProjectDir}" ""
 printf "${SEP_MAJOR}\n"
-
+exit 1
 #=============================================================================
 # Create integration test folder and subdirectories
 #=============================================================================

diff --git a/test/integration/GCHP/integrationTestExecute.sh b/test/integration/GCHP/integrationTestExecute.sh
@@ -118,7 +118,7 @@ rm -f "${results}"
 print_to_log "${SEP_MAJOR}"                               "${results}"
 print_to_log "GCHP: Execution Test Results"               "${results}"
 print_to_log ""                                           "${results}"
-print_submodule_head_commits "10" "${codeDir}"            "${results}"
+print_submodule_head_commits "14" "${codeDir}"            "${results}"
 print_to_log ""                                           "${results}"
 print_to_log "Number of execution tests: ${numTests}"     "${results}"
 print_to_log ""                                           "${results}"

diff --git a/test/shared/commonFunctionsForTests.sh b/test/shared/commonFunctionsForTests.sh
@@ -801,11 +801,11 @@ function print_submodule_head_commits() {
     submods=${submods//path = /}
     for submod in ${submods[@]}; do
 	if [[ "X${submod}" != "X" ]]; then
-	    # Skip the geos-chem-shared-docs output
 	    if [[ ! "${submod}" =~ "geos-chem-shared-docs" ]]; then
 		if [[ -d "${2}/$submod" ]]; then
 		    head=$(git -C "${2}/$submod" log --oneline -1)
 		    y=$(basename $submod)
+		    y=${y/_GridComp/}
 		    if [[ "X${3}" == "X" ]]; then
 			echo "${y:0:n_pad}${pad:0:$((n_pad - ${#y}))}: $head"
 		    else