From ba8e15354e87b75374f7d48b2a1b5d554b48351c Mon Sep 17 00:00:00 2001
From: "Christopher J. Morrone" <morrone2@llnl.gov>
Date: Thu, 4 May 2006 23:04:35 +0000
Subject: [PATCH] Update documentation concerning doc/expect/globals.

---
 doc/html/programmer_guide.shtml | 20 ++++++++++++++++----
 doc/html/quickstart_admin.shtml |  6 +++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/doc/html/programmer_guide.shtml b/doc/html/programmer_guide.shtml
index 05628980ea6..0844ded171e 100644
--- a/doc/html/programmer_guide.shtml
+++ b/doc/html/programmer_guide.shtml
@@ -136,11 +136,23 @@ signalling, restarting, and stopping them.</p>
 
 <h2>Test Suite</h2>
 <p>The <b>testsuite</b> files use a DejaGnu framework for testing. These tests 
-are very limited in scope. We also have a set of Expect SLURM tests available 
-as a separate distribution. These tests are executed after SLURM has been installed 
+are very limited in scope.</p>
+
+<p>We also have a set of Expect SLURM tests available under the <b>testsuite/expect</b>
+directory.  These tests are executed after SLURM has been installed 
 and the daemons initiated. About 110 test scripts exercise all SLURM commands 
-and options including stress tests. Get these test from
-<a href="ftp://ftp.llnl.gov/pub/linux/slurm-qa">ftp://ftp.llnl.gov/pub/linux/slurm-qa</a></p>
+and options including stress tests.  The file <b>testsuite/expect/globals</b>
+contains default paths and procedures for all of the individual tests.  At
+the very least, you will need to set the <i>slurm_dir</i> variable to the correct
+value.  To avoid conflicts with other developers, you can override variable settings
+in a seperate file named <b>testsuite/expect/globals.local</b>.</p>
+
+<p>Set your working directory to <b>testsuite/expect</b> before 
+starting these tests.  Tests may be executed individually by name
+(e.g.  <i>test1.1</i>) 
+or the full test suite may be executed with the single command <i>regression</i>.
+See <b>testsuite/expect/README</b> for more information.</p>
+
 
 <h2>Adding Files and Directories</h2>
 <p>If you are adding files and directories to SLURM, it will be necessary to
diff --git a/doc/html/quickstart_admin.shtml b/doc/html/quickstart_admin.shtml
index bee2b436f69..c8334d7832e 100644
--- a/doc/html/quickstart_admin.shtml
+++ b/doc/html/quickstart_admin.shtml
@@ -554,9 +554,9 @@ There are about 150 tests which will execute on the order of 1000 jobs
 and 2000 job steps. 
 Depending upon your system configuration and performance, this test 
 suite will take roughly 40 minutes to complete.
-You must copy the file <i>testsuite/expect/globals.examples</i>
-to <i>testsuite/expect/globals</i> and modify pathnames depending 
-upon where SLURM and other tools are installed.
+The file <i>testsuite/expect/globals</i> contains default paths and
+procedures for all of the individual tests.  You will need to edit this
+file to specify where SLURM and other tools are installed.
 Set your working directory to <i>testsuite/expect</i> before 
 starting these tests.
 Tests may be executed individually by name (e.g.  <i>test1.1</i>) 
-- 
GitLab