From a6bfe08ed25537de223ee5d873e8ac1cf0d7dece Mon Sep 17 00:00:00 2001
From: Don Lipari <lipari1@llnl.gov>
Date: Tue, 1 Jun 2010 17:48:27 +0000
Subject: [PATCH] Fixed the test23.* suite to match the changes to sstat
introduced in r20354
---
testsuite/expect/test23.1 | 2 +-
testsuite/expect/test23.2 | 4 ++--
testsuite/expect/test23.3 | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/testsuite/expect/test23.1 b/testsuite/expect/test23.1
index b4905a80189..3b5492c69cd 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 ee4749cc0e7..7c8a493274f 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 4ed251e2182..3ddbeec7053 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
--
GitLab