svn merge -r14574:14578 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

NEWS

@@ -413,7 +413,8 @@ documents those changes that are of interest to users and admins.
  -- Fixed handling of SIGPIPE in srun. Abort job.
  -- Fix bug introduced to MVAPICH plugin preventing use of TotalView debugger.
  -- Modify slurmctld to get srun/salloc network address based upon the incoming
-    message rather than hostname set by the user command (backport of logic in 	   SLURM v1.3).
+    message rather than hostname set by the user command (backport of logic in
+    SLURM v1.3).
 
 * Changes in SLURM 1.2.32
 =========================

testsuite/expect/test1.7

@@ -95,7 +95,11 @@ set timeout [expr $max_job_delay + $sleep_time]
 set timed_out 0
 set srun_pid [spawn $srun -t1 $bin_sleep $sleep_time]
 expect {
-	-re "time limit exceeded" {
+	-re "time limit" {
+		set timed_out 1
+		exp_continue
+	}
+	-re "TIME LIMIT" {
 		set timed_out 1
 		exp_continue
 	}
@@ -126,7 +130,11 @@ if {$timed_out == 1} {
 set completions 0
 set srun_pid [spawn $srun -t4 $bin_sleep $sleep_time]
 expect {
-	-re "time limit exceeded" {
+	-re "time limit" {
+		set completions -1
+		exp_continue
+	}
+	-re "TIME LIMIT" {
 		set completions -1
 		exp_continue
 	}