diff --git a/cmake/std/PullRequestLinuxDriver.sh b/cmake/std/PullRequestLinuxDriver.sh index e62c84fd4c98..e4bd714591bc 100755 --- a/cmake/std/PullRequestLinuxDriver.sh +++ b/cmake/std/PullRequestLinuxDriver.sh @@ -86,6 +86,15 @@ fi # advantages to testing newer versions of target instead of older if # not all test jobs kick off right away +#------------------------------- +# Get the merge-base with target +#------------------------------- + +TRILINOS_MERGE_BASE_SHA=`git merge-base ${TRILINOS_SOURCE_SHA} ${TRILINOS_TARGET_SHA}` + +# This will give the correct set of changed files for the correct change logic +# as run by the script get-changed-trilinos-packages.sh + #------------------------------ # Doing setup for build #------------------------------ @@ -161,7 +170,7 @@ echo "CDash Track = ${CDASH_TRACK:?}" #------------------------------------- rm packageEnables.cmake changed_packages_app=Trilinos/commonTools/framework/get-changed-trilinos-packages.sh -${changed_packages_app} ${TRILINOS_SOURCE_SHA} ${TRILINOS_TARGET_SHA} packageEnables.cmake +${changed_packages_app} ${TRILINOS_MERGE_BASE_SHA} ${TRILINOS_SOURCE_SHA} packageEnables.cmake ierror=$? if [[ $ierror != 0 ]]; then