diff --git a/testsuite/expect/test1.45 b/testsuite/expect/test1.45 index 47b27f31eda7235fa39b3d6c619265dfd656f365..dc6f745a6812c96b7e86c058634d787cf2378469 100755 --- a/testsuite/expect/test1.45 +++ b/testsuite/expect/test1.45 @@ -8,7 +8,7 @@ # "FAILURE: ..." otherwise with an explanation of the failure, OR # anything else indicates a failure mode that must be investigated. ############################################################################ -# Copyright (C) 2008 Lawrence Livermore National Security +# Copyright (C) 2008-2009 Lawrence Livermore National Security # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). # Written by Dave Bremer <dbremer@llnl.gov> # CODE-OCEC-09-009. All rights reserved. @@ -105,15 +105,21 @@ if {[wait_for_file $file_out] != 0} { exit 1 } +# NOTE: There could be warning messages generated by the srun commands, +# For example: "srun: Job step creation temporarily disabled, retrying" +# would be due to nodes being powered down +set index 0 spawn $bin_cat $file_out expect { - -re "($number)\r\n($number)\r\n($number)\r\n($number)\r\n($number)\r\n($number)" { - set num_nodes_test1 $expect_out(1,string) - set num_nodes_test2 $expect_out(2,string) - set num_procs_test1 $expect_out(3,string) - set num_procs_test2 $expect_out(4,string) - set num_nodes_test3 $expect_out(5,string) - set num_procs_test3 $expect_out(6,string) + -re "($number)\r\n" { + incr index + if {$index == 1} {set num_nodes_test1 $expect_out(1,string)} + if {$index == 2} {set num_nodes_test2 $expect_out(1,string)} + if {$index == 3} {set num_procs_test1 $expect_out(1,string)} + if {$index == 4} {set num_procs_test2 $expect_out(1,string)} + if {$index == 5} {set num_nodes_test3 $expect_out(1,string)} + if {$index == 6} {set num_procs_test3 $expect_out(1,string)} + exp_continue } eof { wait