From 3349e403ce7ee2a75e2d57212fce84459f709b15 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Sat, 19 Jul 2008 00:05:40 +0000
Subject: [PATCH] svn merge -r14574:14578
https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
---
NEWS | 3 ++-
testsuite/expect/test1.7 | 12 ++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/NEWS b/NEWS
index 236144c8195..d0f17c64ea5 100644
--- a/NEWS
+++ b/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
=========================
diff --git a/testsuite/expect/test1.7 b/testsuite/expect/test1.7
index 52b37442b87..42efc6c938b 100755
--- a/testsuite/expect/test1.7
+++ b/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
}
--
GitLab