From 8d7c3dc07bbce0b9515ac04495e0e1bacea94e70 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 25 Jun 2010 19:46:58 +0000
Subject: [PATCH] tweak the test to operate properly on a core scheduled system
with more than one thread configured per core
---
testsuite/expect/test1.84 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/testsuite/expect/test1.84 b/testsuite/expect/test1.84
index 22ac8ae4e31..15708edeb46 100755
--- a/testsuite/expect/test1.84
+++ b/testsuite/expect/test1.84
@@ -67,7 +67,7 @@ set host ""
set timeout $max_job_delay
set task_cnt 0
-set srun_pid [spawn $srun -N1 --cpus-per-task=1 --exclusive -l -t1 $file_in]
+set srun_pid [spawn $srun -N1 --cpus-per-task=1 --threads-per-core=1 --exclusive -l -t1 $file_in]
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
@@ -119,7 +119,7 @@ if {$cpu_cnt != $task_cnt} {
set exit_code 1
}
if {$cpu_cnt < 2} {
- send_user "\nWARNING: The node only has one CPU\n"
+ send_user "\nWARNING: The node only has one core\n"
exit $exit_code
}
--
GitLab