diff --git a/testsuite/expect/test17.35 b/testsuite/expect/test17.35 index 737f05458f0f7154f688b724e893b8a10c771cfc..aea03fe8394ffc6be267bb7944410d6cde886574 100755 --- a/testsuite/expect/test17.35 +++ b/testsuite/expect/test17.35 @@ -63,20 +63,20 @@ expect { set secs [expr $expect_out(2,string) * 10 + $expect_out(3,string)] set tenths $expect_out(4,string) set hundredths $expect_out(5,string) - set time_used [expr $mins * 6000 + $secs * 100 + $tenths * 10 + $hundredths] + set time_used [expr $mins * 60000 + $secs * 1000 + $tenths * 100 + $hundredths * 10] exp_continue } -re "elapsed ($number):($digit)($digit).($digit)" { set mins $expect_out(1,string) set secs [expr $expect_out(2,string) * 10 + $expect_out(3,string)] set tenths $expect_out(4,string) - set time_used [expr $mins * 6000 + $secs * 100 + $tenths * 10] + set time_used [expr $mins * 60000 + $secs * 1000 + $tenths * 100] exp_continue } -re "elapsed ($number):($digit)($digit)" { set mins $expect_out(1,string) set secs [expr $expect_out(2,string) * 10 + $expect_out(3,string)] - set time_used [expr $mins * 6000 + $secs * 100] + set time_used [expr $mins * 60000 + $secs * 1000] exp_continue } timeout { @@ -97,8 +97,8 @@ exec $scancel --name=$file_in if {$time_used == 0} { set time_used 1 } -set rate [ expr ($job_cnt * 100) / $time_used ] -send_user "Job submit rate $rate jobs per second\n" +set rate [ expr ($job_cnt * 1000) / $time_used ] +send_user "Job submit rate $rate jobs per second ($job_cnt jobs in $time_used msec)\n" if {$rate < $target} { send_user "FAILURE: Job submit rate of $rate below target of $target\n" send_user "FAILURE: This may be due to use of NFS rather than local storage for logs or state information\n"