From f4887c74a0653690743bd19c63aa1bcf74ae87e2 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 6 Oct 2016 09:12:06 -0600
Subject: [PATCH] Disable tests with configuration
SelectTypeParameters=CR_ONE_TASK_PER_CORE
See commit 37161057d72ad5cd14ef84afbce7bf3c77dd8667
Bug 3124.
---
testsuite/expect/test1.113 | 7 ++++++-
testsuite/expect/test15.39 | 7 ++++++-
testsuite/expect/test17.63 | 7 ++++++-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/testsuite/expect/test1.113 b/testsuite/expect/test1.113
index d248e839adb..1a4a98d4359 100755
--- a/testsuite/expect/test1.113
+++ b/testsuite/expect/test1.113
@@ -39,6 +39,11 @@ set ncpus ""
print_header $test_id
+if {[test_select_type_params "CR_ONE_TASK_PER_CORE"]} {
+ send_user "\nWARNING: This test is incompatible SelectTypeParameters=CR_ONE_TASK_PER_CORE\n"
+ exit 0
+}
+
log_user 0
spawn $sinfo -N -h -p $partition -t idle -o "%c"
expect {
@@ -68,7 +73,7 @@ if {$matches < $needed_nodes} {
set nodes 0
set timeout $max_job_delay
-set srun_pid [spawn $srun -p $partition -N1-2 --use-min-nodes -n$ncpus $bin_printenv SLURM_NNODES]
+set srun_pid [spawn $srun -p $partition -N1-2 --use-min-nodes -n$ncpus --ntasks-per-thread=1--cpu-bind=thread $bin_printenv SLURM_NNODES]
expect {
-re "($number)" {
set nodes $expect_out(1,string)
diff --git a/testsuite/expect/test15.39 b/testsuite/expect/test15.39
index dbd9a2b8651..a7e6218bedd 100755
--- a/testsuite/expect/test15.39
+++ b/testsuite/expect/test15.39
@@ -39,6 +39,11 @@ set ncpus ""
print_header $test_id
+if {[test_select_type_params "CR_ONE_TASK_PER_CORE"]} {
+ send_user "\nWARNING: This test is incompatible SelectTypeParameters=CR_ONE_TASK_PER_CORE\n"
+ exit 0
+}
+
log_user 0
spawn $sinfo -N -h -p $partition -t idle -o "%c"
expect {
@@ -68,7 +73,7 @@ if {$matches < $needed_nodes} {
set job_id 0
set timeout $max_job_delay
-set salloc_pid [spawn $salloc -p $partition -N1-2 --use-min-nodes -n$ncpus $bin_printenv SLURM_NNODES]
+set salloc_pid [spawn $salloc -p $partition -N1-2 --use-min-nodes -n$ncpus --hint=nomultithread $bin_printenv SLURM_NNODES]
#set salloc_pid [spawn $salloc -p $partition -N1-2 -n$ncpus $bin_printenv SLURM_NNODES]
expect {
-re "Granted job allocation ($number)" {
diff --git a/testsuite/expect/test17.63 b/testsuite/expect/test17.63
index e35fbcf250f..ffaf3f381da 100755
--- a/testsuite/expect/test17.63
+++ b/testsuite/expect/test17.63
@@ -43,6 +43,11 @@ set ncpus ""
print_header $test_id
+if {[test_select_type_params "CR_ONE_TASK_PER_CORE"]} {
+ send_user "\nWARNING: This test is incompatible SelectTypeParameters=CR_ONE_TASK_PER_CORE\n"
+ exit 0
+}
+
log_user 0
spawn $sinfo -N -h -p $partition -t idle -o "%c"
expect {
@@ -82,7 +87,7 @@ make_bash_script $file_in "
set cwd "[$bin_pwd]"
make_bash_script $file_script "
- $sbatch -p $partition -N1-2 --use-min-nodes -n$ncpus --output=$file_out --error=$file_err $cwd/$file_in
+ $sbatch -p $partition -N1-2 --use-min-nodes -n$ncpus --hint=nomultithread --output=$file_out --error=$file_err $cwd/$file_in
exit 0
"
--
GitLab