From edffb59ecc7de5b989d3f8d3569def3ece20ba14 Mon Sep 17 00:00:00 2001
From: Rob Falgout <rfalgout@llnl.gov>
Date: Tue, 20 Jan 2015 15:53:37 -0800
Subject: [PATCH] Changed cmaketest.sh to clean up previous installs before
 running a new test

---
 AUTOTEST/cmaketest.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/AUTOTEST/cmaketest.sh b/AUTOTEST/cmaketest.sh
index df24c4950..bcae77ef7 100755
--- a/AUTOTEST/cmaketest.sh
+++ b/AUTOTEST/cmaketest.sh
@@ -72,16 +72,25 @@ test_dir=`pwd`
 output_dir=`pwd`/$testname.dir
 rm -fr $output_dir
 mkdir -p $output_dir
+cd $src_dir
+src_dir=`pwd`
+
+# Clean up the cmbuild directories (do it from src_dir as a precaution)
+cd $src_dir
+rm -fr `echo cmbuild/* | sed 's/[^ ]*README.txt//g'`
+rm -fr `echo test/cmbuild/* | sed 's/[^ ]*README.txt//g'`
+
+# Clean up the previous install
+cd $src_dir
+rm -fr hypre
 
 # Configure
 cd $src_dir/cmbuild
-rm -fr `echo * | sed s/README.txt//g`
 cmake $copts ..
 make $mopts install
 
 # Make
 cd $src_dir/test/cmbuild
-rm -fr `echo * | sed s/README.txt//g`
 cmake ..
 make $mopts
 mv -f ams_driver ij ij_mv new_ij sstruct struct ..