From 723c589abac6c96da9c816bac3800d7d3fd159c8 Mon Sep 17 00:00:00 2001
From: "Christopher J. Morrone" <morrone2@llnl.gov>
Date: Tue, 26 Sep 2006 19:08:39 +0000
Subject: [PATCH] Remove InactiveLimit code (no longer necessary). Have the
test script ignore SIGINT.
---
testsuite/expect/test15.5 | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/testsuite/expect/test15.5 b/testsuite/expect/test15.5
index a80558af497..bc158e71f97 100755
--- a/testsuite/expect/test15.5
+++ b/testsuite/expect/test15.5
@@ -42,17 +42,10 @@ set sleep_time 180
print_header $test_id
-#
-# Make sure sleep time is no larger than InactiveLimit
-set inactive_limit $sleep_time
set kill_wait $sleep_time
log_user 0
spawn $scontrol show config
expect {
- -re "InactiveLimit *= ($number)" {
- set inactive_limit $expect_out(1,string)
- exp_continue
- }
-re "KillWait *= ($number)" {
set kill_wait $expect_out(1,string)
exp_continue
@@ -66,26 +59,16 @@ expect {
}
}
log_user 1
-if {$inactive_limit == 0} {
- set inactive_limit $sleep_time
-}
-if {$inactive_limit < 120} {
- send_user "\nWARNING: InactiveLimit ($inactive_limit) is too low for this test\n"
- exit 0
-}
if {$kill_wait > 60} {
send_user "\nWARNING: KillWait ($kill_wait) is too high for this test\n"
exit 0
}
-if {$inactive_limit < $sleep_time} {
- set sleep_time [expr $inactive_limit + $kill_wait]
- send_user "\nReset job sleep time to $sleep_time seconds\n"
-}
#
# Build input script file
#
make_bash_script $file_in "
+ trap \"\" SIGINT
$srun $bin_sleep $sleep_time
$bin_echo FINI
"
--
GitLab