diff --git a/.travis-install-dependencies.sh b/.travis-install-dependencies.sh index f7f4e600f4..24352c8371 100755 --- a/.travis-install-dependencies.sh +++ b/.travis-install-dependencies.sh @@ -28,6 +28,20 @@ OPENMPI_VER=1.10.3 if [[ ${STYLE} ]]; then + # Ensure the 'develop' branch is available. In some cases (merge a branch + # that lives at github.com/losalamos), the develop branch is missing in the + # travis checkout. Since we only test files that are modified when comapred to + # the 'develop' branch, the develop branch must be available locally. + dev_branch_found=`git branch -a | grep -c develop` + if [[ ! $dev_branch_found ]]; then + # Register the develop branch in draco/.git/config + git config --local remote.origin.fetch +refs/heads/develop:refs/remotes/origin/develop + # Download the meta-data for the 'develop' branch + git fetch + # Create a local tracking branch + git branch -t develop origin/develop + fi + # clang-format and git-clang-format echo " " echo "Clang-format" diff --git a/regression/scripts/common.sh b/regression/scripts/common.sh index 68390db61d..a863f8ef33 100644 --- a/regression/scripts/common.sh +++ b/regression/scripts/common.sh @@ -191,8 +191,7 @@ function lookupppn() local ppn=1 case ${target} in ml* | pi* | wf* | lu* ) ppn=16 ;; - mu* ) ppn=24 ;; - t[rt]-fey* | t[rt]-login*) ppn=32 ;; + t[rt]-fe* | t[rt]-login*) ppn=32 ;; sn* ) ppn=36 ;; esac echo $ppn diff --git a/regression/scripts/release_bgq.sh b/regression/scripts/release_bgq.sh index efb3d04d8e..f4081d73c0 100755 --- a/regression/scripts/release_bgq.sh +++ b/regression/scripts/release_bgq.sh @@ -45,7 +45,7 @@ function gcc484() export VENDOR_DIR=/usr/gapps/jayenne/vendors export DK_NODE=$DK_NODE:/$VENDOR_DIR/Modules/sq export OMP_NUM_THREADS=4 - use gcc484 + use gcc484 python-2.7.3 use cmake361 gsl numdiff random123 use }