From b3086e0743e0778ff7f7a6195f39eddcc95f1898 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 11 Sep 2007 19:01:53 +0000
Subject: [PATCH] change salloc and sbatch options from --tasks to --ntasks
---
testsuite/expect/test15.24 | 2 +-
testsuite/expect/test17.32 | 2 +-
testsuite/expect/test17.6 | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/testsuite/expect/test15.24 b/testsuite/expect/test15.24
index 4f64f8509c4..cbdc3d8fc05 100755
--- a/testsuite/expect/test15.24
+++ b/testsuite/expect/test15.24
@@ -54,7 +54,7 @@ make_bash_script $file_in "
set timeout $max_job_delay
set matches 0
set tasks 0
-spawn $salloc --tasks=$task_cnt --overcommit -N1 -t1 $file_in
+spawn $salloc --ntasks=$task_cnt --overcommit -N1 -t1 $file_in
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
diff --git a/testsuite/expect/test17.32 b/testsuite/expect/test17.32
index b26af694904..0a408b0197b 100755
--- a/testsuite/expect/test17.32
+++ b/testsuite/expect/test17.32
@@ -51,7 +51,7 @@ make_bash_script $file_in "
#
# Submit a slurm job that will execute 'id' on 1 node and over task_cnt tasks
#
-spawn $sbatch --tasks=$task_cnt --overcommit -N1 --output=$file_out -t1 $file_in
+spawn $sbatch --ntasks=$task_cnt --overcommit -N1 --output=$file_out -t1 $file_in
expect {
-re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
diff --git a/testsuite/expect/test17.6 b/testsuite/expect/test17.6
index e87a5634918..4ab68d56f19 100755
--- a/testsuite/expect/test17.6
+++ b/testsuite/expect/test17.6
@@ -1,7 +1,7 @@
#!/usr/bin/expect
############################################################################
# Purpose: Test of SLURM functionality
-# Confirm that a job executes with the proper task count (--tasks
+# Confirm that a job executes with the proper task count (--ntasks
# option).
#
# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -48,7 +48,7 @@ file delete $file_in $file_out
make_bash_script $file_in "$srun $bin_id"
set job_id 0
set no_run 0
-spawn $sbatch --tasks=$task_cnt --output=$file_out -t1 $file_in
+spawn $sbatch --ntasks=$task_cnt --output=$file_out -t1 $file_in
expect {
-re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
@@ -107,7 +107,7 @@ file delete $file_in $file_out
make_bash_script $file_in "$srun -n $task_cnt --overcommit $bin_id"
set job_id 0
set tasks 0
-spawn $sbatch --tasks=1 --output=$file_out -t1 $file_in
+spawn $sbatch --ntasks=1 --output=$file_out -t1 $file_in
expect {
-re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
--
GitLab