From 5f575c748885b8403c9ea8af4018d3cdd63dda38 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 28 Nov 2017 10:36:05 -0700
Subject: [PATCH] Revert commit ddd1a686945 to correct author
---
testsuite/expect/test1.14 | 6 +++---
testsuite/expect/test1.75 | 4 ++--
testsuite/expect/test1.77 | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/testsuite/expect/test1.14 b/testsuite/expect/test1.14
index 59751413b87..fc8f9a1cdc7 100755
--- a/testsuite/expect/test1.14
+++ b/testsuite/expect/test1.14
@@ -85,7 +85,7 @@ make_bash_script $file_in2 "
#
# Spawn a job via sbatch
#
-spawn $sbatch -N1 -t2 --gres=craynetwork:0 --output=$file_out ./$file_in
+spawn $sbatch -N1 -t2 --gres=craynetwork:0 --output=$file_out $file_in
expect {
-re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
@@ -169,14 +169,14 @@ make_bash_script $file_in "
inx=\$((inx+1))
done
$bin_sleep 4
- $srun -v --exclusive -n1 --mem=0 --immediate ./$file_in2 &
+ $srun -v --exclusive -n1 --mem=0 --immediate $file_in2 &
wait
"
#
# Spawn a job via sbatch
#
-spawn $sbatch -N1 -t2 --gres=craynetwork:0 --output=$file_out2 ./$file_in
+spawn $sbatch -N1 -t2 --gres=craynetwork:0 --output=$file_out2 $file_in
expect {
-re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
diff --git a/testsuite/expect/test1.75 b/testsuite/expect/test1.75
index d48d984f2f3..d107ca6af48 100755
--- a/testsuite/expect/test1.75
+++ b/testsuite/expect/test1.75
@@ -90,7 +90,7 @@ proc sub_job { freq } {
foreach option [array names this_freq] {
send_user "\n======= TESTING FREQUENCY/GOVERNOR $option =======\n"
set job_id 0
- set srun_pid [spawn $srun -t1 --cpu-freq=$option -n$threads -w$node ./$file_id]
+ set srun_pid [spawn $srun -t1 --cpu-freq=$option -n$threads -w$node $file_id]
expect {
-re "not allowed" {
if {[string first $option $avail_governors] == -1} {
@@ -151,7 +151,7 @@ make_bash_script $file_id "echo SLURM_JOB_ID=\$SLURM_JOB_ID; $bin_sleep 30"
make_bash_script $file_in "cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors"
# Identify a node that we can use and available governors
-spawn $sbatch -N1 -t1 -o/dev/null --exclusive -o $file_out ./$file_in
+spawn $sbatch -N1 -t1 -o/dev/null --exclusive -o $file_out $file_in
expect {
-re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
diff --git a/testsuite/expect/test1.77 b/testsuite/expect/test1.77
index 81f6fa023dc..5c7cf885dd5 100755
--- a/testsuite/expect/test1.77
+++ b/testsuite/expect/test1.77
@@ -53,7 +53,7 @@ make_bash_script $file_in "
# Tests -J by using srun
#
set found 0
-set srun_pid [spawn $srun -J $name -t1 ./$file_in]
+set srun_pid [spawn $srun -J $name -t1 $file_in]
expect {
"SLURM_JOB_NAME=$name" {
set found 1
--
GitLab