Skip to content
Snippets Groups Projects
Commit 288a717b authored by Moe Jette's avatar Moe Jette
Browse files

Reorder some logic in test7.11 for proper parsing (use sorted output)

parent 6cd0780a
No related branches found
No related tags found
No related merge requests found
This file describes changes in recent versions of SLURM. It primarily This file describes changes in recent versions of SLURM. It primarily
documents those changes that are of interest to users and admins. documents those changes that are of interest to users and admins.
* Changes in SLURM 1.4.0-pre9
=============================
* Changes in SLURM 1.4.0-pre8 * Changes in SLURM 1.4.0-pre8
============================= =============================
-- In order to create a new partition using the scontrol command, use -- In order to create a new partition using the scontrol command, use
......
...@@ -295,14 +295,6 @@ if {[wait_for_file $spank_out] == 0} { ...@@ -295,14 +295,6 @@ if {[wait_for_file $spank_out] == 0} {
set matches_srun 0 set matches_srun 0
spawn $bin_sort $spank_out spawn $bin_sort $spank_out
expect { expect {
-re "spank_get_item: argv" {
incr matches
exp_continue
}
-re "spank_get_item: my_uid=" {
incr matches
exp_continue
}
-re "slurm_spank_exit: opt_arg=($number)" { -re "slurm_spank_exit: opt_arg=($number)" {
if {$expect_out(1,string) == 4} { if {$expect_out(1,string) == 4} {
incr matches_sbatch incr matches_sbatch
...@@ -321,6 +313,14 @@ if {[wait_for_file $spank_out] == 0} { ...@@ -321,6 +313,14 @@ if {[wait_for_file $spank_out] == 0} {
} }
exp_continue exp_continue
} }
-re "spank_get_item: argv" {
incr matches
exp_continue
}
-re "spank_get_item: my_uid=" {
incr matches
exp_continue
}
eof { eof {
wait wait
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment