Skip to content

Commit

Permalink
Allow pointing to different Trilinos scripts and repo dir (trilinos#3133
Browse files Browse the repository at this point in the history
)

This allows for local testing of the script PullRequestLinuxDriver.sh and
other such use cases.

I also changed some $VAR to ${VAR} to be safe and I fixed a print typo.
  • Loading branch information
bartlettroscoe authored and tjfulle committed Dec 6, 2018
1 parent 19f3dc0 commit 62771dc
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions commonTools/framework/get-changed-trilinos-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,20 @@ fi

echo "TRILINOS_DIR=$TRILINOS_DIR"

# Allow a different source tree for the Trilinos scripts
if [ "$TRILINOS_SCRIPTS_DIR" == "" ] ; then
TRILINOS_SCRIPTS_DIR=${TRILINOS_DIR}
fi

echo "TRILINOS_SCRIPTS_DIR=$TRILINOS_SCRIPTS_DIR"

ORIG_CWD=$PWD

# Allow override of TriBITS for testing purposes
if [ "${GCTP_TRIBITS_DIR_OVERRIDE}" != "" ] ; then
TRIBITS_DIR=$GCTP_TRIBITS_DIR_OVERRIDE
else
TRIBITS_DIR=$TRILINOS_DIR/cmake/tribits
TRIBITS_DIR=$TRILINOS_SCRIPTS_DIR/cmake/tribits
fi
echo "TRIBITS_DIR=$TRIBITS_DIR"

Expand Down Expand Up @@ -123,11 +130,11 @@ CHANGED_FILES_FILE=$ORIG_CWD/changed-files.txt
cd $TRILINOS_DIR/
echo "Current directory: $PWD"
echo
echo "$GIT_EXEC diff --name-only $GIT_COMMIT_FROM..$GIT_COMMIT_TO > $CHANGED_FILES_FILE"
$GIT_EXEC diff --name-only $GIT_COMMIT_FROM..$GIT_COMMIT_TO > $CHANGED_FILES_FILE
echo "$GIT_EXEC diff --name-only ${GIT_COMMIT_FROM}..${GIT_COMMIT_TO} > ${CHANGED_FILES_FILE}"
$GIT_EXEC diff --name-only ${GIT_COMMIT_FROM}..${GIT_COMMIT_TO} > ${CHANGED_FILES_FILE}
cd $ORIG_CWD/
echo
echo "Wrote file 'checked-files.txt'"
echo "Wrote file 'changed-files.txt'"
echo
echo "Current directory: $PWD"

Expand Down

0 comments on commit 62771dc

Please sign in to comment.