From 294ebee76d5a216683a89e3cc2fb22b1fb79cddb Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 15 Jun 2009 18:34:37 +0000
Subject: [PATCH] get test4.12 working properly with shared=exclusive on
default partition
---
testsuite/expect/test4.12 | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/testsuite/expect/test4.12 b/testsuite/expect/test4.12
index e860b5a94d8..c40da47b2fe 100755
--- a/testsuite/expect/test4.12
+++ b/testsuite/expect/test4.12
@@ -310,8 +310,13 @@ if {!$def_part_found} {
# find the nodes in the default partition
log_user 1
set def_hostlist ""
+set part_exclusive 0
spawn $scontrol show part $def_part
expect {
+ -re " Shared=EXCLUSIVE" {
+ set part_exclusive 1
+ exp_continue
+ }
-re " Nodes=($alpha_numeric_nodelist)" {
set def_hostlist $expect_out(1,string)
exp_continue
@@ -429,12 +434,10 @@ if {![string compare $select_type "bluegene"]} {
} elseif {![string compare $select_type "linear"]} {
set smallest $inode_procs
} else {
-#
-# Ignore for now, but if the partition's "Shared=Exclusive" then allocate
-# whole nodes to the jobs in that partition, set smallest $inode_procs
-#
set select_params [test_select_type_params]
- if {![string compare $select_params "CR_CPU"]} {
+ if {$part_exclusive == 1} {
+ set smallest $inode_procs
+ } elseif {![string compare $select_params "CR_CPU"]} {
set smallest $inode_threads_per_core
} elseif {![string compare $select_params "CR_CPU_MEMORY"]} {
set smallest $inode_threads_per_core
--
GitLab