From fe581711d3d8aa326ccecae9a8a256e386dc29d2 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 25 Oct 2005 20:51:03 +0000
Subject: [PATCH] Update documentation for local slurm-qa/expect tests.

---
 doc/html/quickstart_admin.html |  8 +++++---
 testsuite/expect/regression    | 19 ++++++++++++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/doc/html/quickstart_admin.html b/doc/html/quickstart_admin.html
index 6ff0b8bddb7..d2a2d652f22 100644
--- a/doc/html/quickstart_admin.html
+++ b/doc/html/quickstart_admin.html
@@ -545,9 +545,11 @@ Depending upon your system configuration and performance, this test
 suite will take roughly 40 minutes to complete.
 Depending upon where SLURM and other files are installed, you may need 
 to modify pathnames in the file <i>testsuite/expect/globals</i>.
-Tests may be executed individually by name (e.g. 
-<i>testsuite/expect/test1.1</i>) or the full test suite may be 
-executed with the single command <i>testsuite/expect/regression</i>.
+Change 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>) 
+or the full test suite may be executed with the single command 
+<i>regression</i>.
 See <i>testsuite/expect/README</i> for more information.</p>
 
 <h3>Upgrades</h3>
diff --git a/testsuite/expect/regression b/testsuite/expect/regression
index 67d7b395cb0..a683ffdf38e 100755
--- a/testsuite/expect/regression
+++ b/testsuite/expect/regression
@@ -3,9 +3,9 @@
 # Purpose: Test of SLURM functionality
 #          Executes the full battery of tests.
 #
-# Output:  "Failures:#\nCompletions:#" with a count of tests executed successfully 
-#          and failures respectively. The exit code is zero only if all tests 
-#          executed successfully.
+# Output:  "Failures:#\nCompletions:#" with a count of tests executed 
+#          successfully and failures respectively. The exit code is zero 
+#          only if all tests executed successfully.
 ############################################################################
 # Copyright (C) 2002 The Regents of the University of California.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@@ -33,6 +33,19 @@
 FAILURES=0
 COMPLETIONS=0
 
+# Make sure we are in the desired directory before possibly 
+# removing files the user does not want to lose.
+wc ./globals >/dev/null 2>/dev/null
+rc=$?
+if [ $rc -eq 0 ]; then
+	wc ./regression >/dev/null 2>/dev/null
+	rc=$?
+fi
+if [ $rc -ne 0 ]; then
+	echo "FAILURE: cd to testsuite/expect before starting regression"
+	exit 1
+fi
+
 # Remove any recently edited back-up files
 /bin/rm -f test*.*% test*input test*output test*error 
 
-- 
GitLab