From 93247daea1a2fd06498bbdcb23f5d13461bdfde5 Mon Sep 17 00:00:00 2001
From: Rob Falgout <rfalgout@llnl.gov>
Date: Mon, 16 Oct 2017 11:33:58 -0700
Subject: [PATCH] Fixed the external blas test and nested string issue in
 autotest

---
 AUTOTEST/basic.sh              | 3 ++-
 AUTOTEST/configure.sh          | 5 +++--
 AUTOTEST/machine-tux-exlibs.sh | 7 +++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/AUTOTEST/basic.sh b/AUTOTEST/basic.sh
index b6a13540f..479015312 100755
--- a/AUTOTEST/basic.sh
+++ b/AUTOTEST/basic.sh
@@ -75,7 +75,8 @@ rm -fr $output_dir
 mkdir -p $output_dir
 
 # Configure
-./test.sh configure.sh $src_dir $copts
+# NOTE: The use of 'eval' is needed to deal properly with nested quotes in argument lists
+eval ./test.sh configure.sh $src_dir $copts
 mv -f configure.??? $output_dir
 
 # Make
diff --git a/AUTOTEST/configure.sh b/AUTOTEST/configure.sh
index 6913f56ce..8580ee60c 100755
--- a/AUTOTEST/configure.sh
+++ b/AUTOTEST/configure.sh
@@ -40,12 +40,13 @@ src_dir=`cd $1; pwd`
 shift
 
 # Run configure
+# NOTE: The use of 'eval' is needed to deal properly with nested quotes in argument lists
 cd $src_dir
 if [ "`uname -s`" = "AIX" ]
 then
-   nopoe ./configure $@
+   eval nopoe ./configure $@
 else
-   ./configure $@
+   eval ./configure $@
 fi
 
 # Save config.log, HYPRE_config.h and Makefile.config
diff --git a/AUTOTEST/machine-tux-exlibs.sh b/AUTOTEST/machine-tux-exlibs.sh
index e2dc35b90..826fe1897 100755
--- a/AUTOTEST/machine-tux-exlibs.sh
+++ b/AUTOTEST/machine-tux-exlibs.sh
@@ -48,10 +48,9 @@ mo="-j test"
 ro="-ams -ij -sstruct -struct"
 eo=""
 
-# RDF: Unfortunately, there is no way to pass the inside quotes through to configure
-# co="--enable-debug --with-blas-lib='-L/home/falgout2/codes/blas/BLAS-3.7.1 -lblas -lgfortran'"
-# ./test.sh basic.sh $src_dir -co: $co -mo: $mo
-# ./renametest.sh basic $output_dir/basic-blas
+co="--enable-debug --with-blas-lib=\\'-L/home/falgout2/codes/blas/BLAS-3.7.1 -lblas -lgfortran\\'"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-blas
 
 co="--enable-debug --with-mli --with-superlu --with-superlu-include=/home/falgout2/codes/superlu/SuperLU_5.2.1/SRC"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo