Add test for salloc env vars.

testsuite/expect/README

@@ -364,8 +364,8 @@ test15.20  Confirm that a job executes with the specified nodes
 test15.21  Test of contiguous option with multiple nodes (--contiguous option).
 test15.22  Test of partition specification on job submission (--partition  
            option).
-test15.TBD Test of environment variables that control salloc actions: 
-           SALLOC_DEBUG, ...
+test15.23  Test of environment variables that control salloc actions: 
+           SALLOC_ACCOUNT, SALLOC_DEBUG and SALLOC_TIMELIMIT
 
 
 test16.#   Testing of sattach options.
@@ -481,7 +481,7 @@ test18.30  Confirm that a job executes with the proper node count
 test18.31  Confirm that a job executes with the specified nodes
             (--relative, --nodelist-byname and --nodelist-byid).
 test18.32  Basic MPI functionality tests via slaunch.
-test18.33  Verify that SLURM directed environment variables are processed
+test18.33  Verify environment variables controlling slaunch are processed:
            SLAUNCH_DEBUG, SLAUNCH_DISTRIBUTION, SLAUNCH_LABELIO and 
            SLAUNCH_OVERCOMMIT
 test18.34  Test slaunch's ability to set the job step's name (--name option)

testsuite/expect/test15.23

+#!/usr/bin/expect
+############################################################################
+# Purpose: Test of SLURM functionality
+#          Verify environment variables controlling sallocare processed:
+#          SALLOC_ACCOUNT, SALLOC_DEBUG and SALLOC_TIMELIMIT
+#
+# Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
+#          "FAILURE: ..." otherwise with an explanation of the failure, OR
+#          anything else indicates a failure mode that must be investigated.
+############################################################################
+# Copyright (C) 2002-2006 The Regents of the University of California.
+# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+# Written by Morris Jette <jette1@llnl.gov>
+# UCRL-CODE-217948.
+# 
+# This file is part of SLURM, a resource management program.
+# For details, see <http://www.llnl.gov/linux/slurm/>.
+#  
+# SLURM is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+# 
+# SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with SLURM; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+############################################################################
+source ./globals
+
+set test_id          "15.23"
+set exit_code        0
+set job_id           0
+set timeout          $max_job_delay
+
+print_header $test_id
+
+#
+# Set target environment variables
+#
+global env
+set env(SALLOC_ACCOUNT)       tst.acct
+set env(SALLOC_DEBUG)         2
+set env(SALLOC_TIMELIMIT)     2
+
+#
+# Spawn a job via slaunch using these environment variables
+#
+set matches 0
+spawn $salloc -N1 $bin_bash
+expect {
+	-re "debug:  Entering _msg_thr_create" {
+		incr matches
+		exp_continue
+	}
+	-re "Granted job allocation ($number)" {
+		set job_id $expect_out(1,string)
+		send "$scontrol show job $job_id\n"
+		exp_continue
+	}
+	-re "TimeLimit=($number)" {
+		if {$expect_out(1,string) == 2} {
+			incr matches
+		} else {
+			send_user "FAILURE: TimeLimit not set\n"
+			set exit_code 1
+		}
+		exp_continue
+	}
+	-re "Account=tst.acct" {
+		incr matches
+		send "exit\n"
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: srun not responding\n"
+		if {$job_id == 0} {
+			kill_salloc
+		} else {
+			cancel_job $job_id
+		}
+		set exit_code 1
+		exp_continue
+	}
+	eof {
+		wait
+	}
+}
+
+if {$job_id == 0} {
+	send_user "\nFAILURE: did not get job_id\n" 
+	exit 1
+}
+if {$matches != 3} {
+	send_user "\nFAILURE: processed $matches of 3 environment variables\n"
+	set exit_code 1
+}
+
+if {$exit_code == 0} {
+	send_user "\nSUCCESS\n"
+}
+exit $exit_code

testsuite/expect/test18.33

 #!/usr/bin/expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Verify that SLURM directed environment variables are processed:
+#          Verify environment variables controlling slaunch are processed:
 #          SLAUNCH_DEBUG, SLAUNCH_DISTRIBUTION, SLAUNCH_LABELIO and 
 #          SLAUNCH_OVERCOMMIT
 #