Fixed the test23.* suite to match the changes to sstat introduced in r20354

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

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
 	}

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