From 69d335e04bd2e80df0f5576df1db4f029c69ec78 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 6 Oct 2016 09:32:22 -0600
Subject: [PATCH] Remove experiemental code
Accidentally added in commit f4887c74a0653690743bd19c63aa1bcf74ae87e2
bug 3124
---
testsuite/expect/test1.113 | 2 +-
testsuite/expect/test15.39 | 2 +-
testsuite/expect/test17.63 | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/testsuite/expect/test1.113 b/testsuite/expect/test1.113
index 1a4a98d4359..0e852e2be57 100755
--- a/testsuite/expect/test1.113
+++ b/testsuite/expect/test1.113
@@ -73,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 --ntasks-per-thread=1--cpu-bind=thread $bin_printenv SLURM_NNODES]
+set srun_pid [spawn $srun -p $partition -N1-2 --use-min-nodes -n$ncpus $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 a7e6218bedd..de2d751a98d 100755
--- a/testsuite/expect/test15.39
+++ b/testsuite/expect/test15.39
@@ -73,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 --hint=nomultithread $bin_printenv SLURM_NNODES]
+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 -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 ffaf3f381da..046bfa37285 100755
--- a/testsuite/expect/test17.63
+++ b/testsuite/expect/test17.63
@@ -87,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 --hint=nomultithread --output=$file_out --error=$file_err $cwd/$file_in
+ $sbatch -p $partition -N1-2 --use-min-nodes -n$ncpus --output=$file_out --error=$file_err $cwd/$file_in
exit 0
"
--
GitLab