adjust cooley tests to use spack fork

- previous patch to work around bad interaction with bash scripts was no
  longer working

perf-regression/cooley/margo-regression-ofi-rxm.qsub

@@ -7,7 +7,6 @@
 
 export FI_FORK_UNSAFE=1
 
-export SPACK_SHELL=bash
 . $SANDBOX/spack/share/spack/setup-env.sh
 spack load -r ssg 
 

perf-regression/cooley/run-regression-ofi-rxm.sh

@@ -17,7 +17,6 @@ JOBDIR=$PWD/mochi-regression-job-$$
 
 # scratch area to clone and build things
 mkdir $SANDBOX
-cp spack-shell.patch  $SANDBOX/
 cp packages.yaml $SANDBOX/
 
 # scratch area for job submission
@@ -25,7 +24,7 @@ mkdir $JOBDIR
 cp margo-regression-ofi-rxm.qsub $JOBDIR
 
 cd $SANDBOX
-git clone https://github.com/spack/spack.git
+git clone https://github.com/carns/spack.git
 git clone https://xgitlab.cels.anl.gov/sds/sds-repo.git
 git clone https://xgitlab.cels.anl.gov/sds/sds-tests.git
 wget http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.3.2.tar.gz
@@ -35,8 +34,7 @@ git clone https://github.com/pdlfs/mercury-runner.git
 # set up most of the libraries in spack
 echo "=== BUILD SPACK PACKAGES AND LOAD ==="
 cd $SANDBOX/spack
-patch -p1 < ../spack-shell.patch
-export SPACK_SHELL=bash
+git checkout carns/dev-shell-detection
 . $SANDBOX/spack/share/spack/setup-env.sh
 # put packages file in place in SPACK_ROOT to set our preferences for building
 # Mochi stack

perf-regression/cooley/spack-rdma-core-rundir.patch

-diff --git a/var/spack/repos/builtin/packages/rdma-core/package.py b/var/spack/repos/builtin/packages/rdma-core/package.py
-index 22307be6c..1c6698e7d 100644
---- a/var/spack/repos/builtin/packages/rdma-core/package.py
-+++ b/var/spack/repos/builtin/packages/rdma-core/package.py
-@@ -40,7 +40,12 @@ class RdmaCore(CMakePackage):
-     conflicts('platform=darwin', msg='rdma-core requires FreeBSD or Linux')
-     conflicts('%intel', msg='rdma-core cannot be built with intel (use gcc instead)')
- 
-+# NOTE: specify CMAKE_INSTALL_RUNDIR explicitly to prevent rdma-core from
-+#       using the spack staging build dir (which may be a very long file 
-+#       system path) as a component in compile-time static strings such as 
-+#       IBACM_SERVER_PATH.
-     def cmake_args(self):
-         cmake_args = ["-DCMAKE_INSTALL_SYSCONFDIR=" +
--                      self.spec.prefix.etc]
-+                      self.spec.prefix.etc,
-+                      "-DCMAKE_INSTALL_RUNDIR=/var/run"]
-         return cmake_args

perf-regression/cooley/spack-shell.patch

-diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh
-index b983299..e19aa76 100755
---- a/share/spack/setup-env.sh
-+++ b/share/spack/setup-env.sh
-@@ -199,12 +199,17 @@ _spack_pathadd PATH       "${_sp_prefix%/}/bin"
- export SPACK_ROOT=${_sp_prefix}
- 
- #
--# Determine which shell is being used
-+# Try to determine which shell is being used if
-+# SPACK_SHELL has not already been set by the user.
-+# This variable is used for the environment-modules
-+# 'module' function/command to envoke 'modulecmd' with
-+# the correct shell.
- #
- function _spack_determine_shell() {
--	ps -p $$ | tail -n 1 | awk '{print $4}' | sed 's/^-//' | xargs basename
-+        ps -p $$ | tail -n 1 | awk '{print $4}' | sed 's/^-//' | xargs basename
- }
--export SPACK_SHELL=$(_spack_determine_shell)
-+SPACK_SHELL=${SPACK_SHELL:-$(_spack_determine_shell)}
-+export SPACK_SHELL
- 
- #
- # Check whether a function of the given name is defined