diff --git a/testsuite/expect/test23.1 b/testsuite/expect/test23.1 index b4905a80189ff7b161bb9098f85c9ad176506436..3b5492c69cdeaf273d95b8b1ecda49c03c7d479d 100755 --- a/testsuite/expect/test23.1 +++ b/testsuite/expect/test23.1 @@ -83,7 +83,7 @@ proc sstat_job { soption } { incr matches exp_continue } - -re "MinCPUTask *NTasks *SystemCPU *TotalCPU" { + -re "MinCPUTask *NTasks" { if {$debug} {send_user "\nmatch5\n"} incr matches exp_continue diff --git a/testsuite/expect/test23.2 b/testsuite/expect/test23.2 index ee4749cc0e7e15026d9f6c86c5efa2dd4da488f8..7c8a493274fdfd618c751210b026d49595c19944 100755 --- a/testsuite/expect/test23.2 +++ b/testsuite/expect/test23.2 @@ -61,7 +61,7 @@ expect { incr matches exp_continue } - -re "MinCPUTask *NTasks *SystemCPU *TotalCPU" { + -re "MinCPUTask *NTasks" { incr matches exp_continue } @@ -102,7 +102,7 @@ expect { incr matches exp_continue } - -re "MinCPUTask *NTasks *SystemCPU *TotalCPU" { + -re "MinCPUTask *NTasks" { incr matches exp_continue } diff --git a/testsuite/expect/test23.3 b/testsuite/expect/test23.3 index 4ed251e21825ced7b1607a4fc5c9eb8b9c04413d..3ddbeec705365ff23d62b89acaf692eac06a3f9b 100755 --- a/testsuite/expect/test23.3 +++ b/testsuite/expect/test23.3 @@ -59,8 +59,6 @@ set mc MinCPU set mn MinCPUNode set mt MinCPUTask set nt NTasks -set sc SystemCPU -set tc TotalCPU # # Check accounting config and bail if not found. # @@ -536,7 +534,7 @@ proc sstat_vargs { soption vargs job_id} { incr matches exp_continue } - -re "MinCPUTask.NTasks.SystemCPU.TotalCPU" { + -re "MinCPUTask.NTasks" { if {$debug} {send_user "\nmatch22\n"} incr matches exp_continue