Add another salloc test

testsuite/expect/README

@@ -340,6 +340,8 @@ test15.7   Test of processors, memory, and temporary disk space
            constraints options (--mincpus, --mem, and --tmp options).
            Also test that priority zero job is not started (--hold option).
 test15.8   Test of immediate allocation option (--immediate option).
+test15.9   Confirm that salloc exit code processing.
+test15.10  Confirm that a job executes with the proper processor count (--nprocs)
 
 
 test16.#   Testing of sattach options.

testsuite/expect/test1.17

@@ -56,6 +56,11 @@ expect {
 		send "exit 2\n"
 		exp_continue
 	}
+	-re "MY_ID=" {
+#		no environment variable
+		send "exit 2\n"
+		exp_continue
+	}
 	-re "\[Ee\]xit 2" {
 		send_user "This error was expected, no worries\n"
 		set match 1

testsuite/expect/test15.9

+#!/usr/bin/expect
+############################################################################
+# Purpose: Test of SLURM functionality
+#          Confirm that salloc exit code processing.
+#
+# 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.,
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+############################################################################
+source ./globals
+
+set test_id            "15.9"
+set exit_code          0
+set job_id             0
+set slurm_jobid        0
+
+print_header $test_id
+
+#
+# Submit a slurm allocate job
+# Interactively print $SLURM_JOBID
+#
+set timeout $max_job_delay
+set match 0
+spawn $salloc --verbose -t1 $bin_bash
+expect {
+	-re "Granted job allocation ($number).*" {
+		set job_id $expect_out(1,string)
+		send "$bin_echo MY_ID=\$SLURM_JOBID \n"
+		exp_continue
+	}
+	-re "MY_ID=($number)" {
+		set slurm_jobid $expect_out(1,string)
+		send "exit 2\n"
+		exp_continue
+	}
+	-re "MY_ID=" {
+#		no environment variable
+		send "exit 2\n"
+		exp_continue
+	}
+	-re "\[Ee\]xit 2" {
+		send_user "This error was expected, no worries\n"
+		set match 1
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: salloc not responding\n"
+		kill_salloc
+		set exit_code 1
+		exp_continue
+	}
+	eof {
+		wait
+	}
+}
+
+
+#
+# Confirm the job_ids match.
+#
+if { $job_id == 0 } {
+	send_user "\nFAILURE: salloc --allocate failure\n"
+	set exit_code 1
+} else {
+	if { $job_id != $slurm_jobid } {
+		send_user "\nFAILURE: srun job_id mismatch\n"
+		set exit_code 1
+	}
+}
+
+#
+# Confirm exit code is propogated
+#
+if { $match != 1 } {
+	send_user "\nFAILURE: srun exit code not reported\n"
+	set exit_code 1
+}
+
+if { $exit_code == 0 } {
+	send_user "\nSUCCESS\n"
+}
+exit $exit_code