From 002966c869ab452c28a8cab8cf685b94ebbcbba2 Mon Sep 17 00:00:00 2001
From: "Joseph P. Donaghy" <donaghy1@llnl.gov>
Date: Thu, 28 Oct 2010 21:31:44 +0000
Subject: [PATCH] modifying variable convention.
---
testsuite/expect/test21.10 | 7 ++++---
testsuite/expect/test21.11 | 21 +++++++++++----------
testsuite/expect/test21.5 | 6 ++++--
testsuite/expect/test21.6 | 9 +++++----
testsuite/expect/test21.7 | 9 +++++----
testsuite/expect/test21.8 | 9 +++++----
testsuite/expect/test21.9 | 9 +++++----
testsuite/expect/test22.1 | 2 +-
8 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/testsuite/expect/test21.10 b/testsuite/expect/test21.10
index 352bdcdab30..b5b7e52be0d 100755
--- a/testsuite/expect/test21.10
+++ b/testsuite/expect/test21.10
@@ -7,7 +7,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-2010 Lawrence Livermore National Security.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
source ./globals
set test_id "21.10"
+set test_nu "test21-10"
set exit_code 0
set acmatches 0
set aamatches 0
@@ -61,7 +62,7 @@ set ms MaxSubmitJobs
set mn MaxNodes
set mw MaxWall
set clu cluster
-set tc1 tcluster1
+set tc1 [format "%s%s" $test_nu "clus1"]
set fs1 2500
set gm1 1000
set gc1 20
@@ -77,7 +78,7 @@ set mn1 200
set mw1 01:00:00
set acc account
set ass associations
-set nm1 testaccta1
+set nm1 [format "%s%s" $test_nu "acct1"]
set des Description
set ds1 "Test Account A1"
set org Organization
diff --git a/testsuite/expect/test21.11 b/testsuite/expect/test21.11
index 4a4de9e7f30..f1191ff0f3f 100755
--- a/testsuite/expect/test21.11
+++ b/testsuite/expect/test21.11
@@ -7,7 +7,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-2010 Lawrence Livermore National Security.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
source ./globals
set test_id "21.11"
+set test_nu "test21-11"
set exit_code 0
set acmatches 0
set aamatches 0
@@ -53,8 +54,8 @@ set mj MaxJobs
set mn MaxNodes
set mw MaxWall
set clu cluster
-set tc1 tcluster1
-set tc2 tcluster2
+set tc1 [format "%s%s" $test_nu "clus1"]
+set tc2 [format "%s%s" $test_nu "clus2"]
set fs1 2500
set mc1 1000000
set mj1 50
@@ -62,8 +63,8 @@ set mn1 300
set mw1 01:00:00
set acc account
set ass associations
-set nm1 testaccta1
-set nm2 testaccta2
+set nm1 [format "%s%s" $test_nu "acct1"]
+set nm2 [format "%s%s" $test_nu "acct2"]
set des Description
set ds1 "Test Account A1"
set org Organization
@@ -152,22 +153,22 @@ if {$aamatches != 1} {
#
# Use sacctmgr to list the test associations
#
-set as_list_pid [spawn $sacctmgr list $ass $clu=$tc1,$tc2]
+set as_list_pid [spawn $sacctmgr -p list $ass $clu=$tc1,$tc2]
expect {
- -re "$tc1 *$nm1" {
+ -re "$tc1.$nm1" {
incr almatches
exp_continue
}
- -re "$tc1 *$nm2" {
+ -re "$tc1.$nm2" {
incr almatches
exp_continue
}
- -re "$tc2 *$nm1" {
+ -re "$tc2.$nm1" {
set exit_code 1
send_user "\nFAILURE: $nm1 account erroneously added to $tc2\n"
exp_continue
}
- -re "$tc2 *$nm2" {
+ -re "$tc2.$nm2" {
exp_continue
send_user "\nFAILURE: $nm2 account erroneously added to $tc2\n"
set exit_code 1
diff --git a/testsuite/expect/test21.5 b/testsuite/expect/test21.5
index 86f5378d002..33c0ca062b0 100755
--- a/testsuite/expect/test21.5
+++ b/testsuite/expect/test21.5
@@ -7,7 +7,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-2010 Lawrence Livermore National Security.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
source ./globals
set test_id "21.5"
+set test_nu "test21-5"
set exit_code 0
set amatches 0
set lmatches 0
@@ -56,7 +57,8 @@ set ms MaxSubmitJobs
set mn MaxNodes
set mw MaxWall
set clu cluster
-set tc1 tcluster1
+set tc1 [format "%s%s" $test_nu "clus"]
+#set tc1 tcluster1
set fs1 2500
set gc1 50
set gj1 100
diff --git a/testsuite/expect/test21.6 b/testsuite/expect/test21.6
index e63d1842dbb..a755eb9ec7e 100755
--- a/testsuite/expect/test21.6
+++ b/testsuite/expect/test21.6
@@ -7,7 +7,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-2010 Lawrence Livermore National Security.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
source ./globals
set test_id "21.6"
+set test_nu "test21-6"
set exit_code 0
set amatches 0
set lmatches 0
@@ -56,9 +57,9 @@ set ms MaxSubmitJobs
set mn MaxNodes
set mw MaxWall
set clu cluster
-set tc1 tcluster1
-set tc2 tcluster2
-set tc3 tcluster3
+set tc1 [format "%s%s" $test_nu "clus1"]
+set tc2 [format "%s%s" $test_nu "clus2"]
+set tc3 [format "%s%s" $test_nu "clus3"]
set fs1 2500
set gc1 50
set gj1 100
diff --git a/testsuite/expect/test21.7 b/testsuite/expect/test21.7
index 955fdd26041..a7edbbd9bc5 100755
--- a/testsuite/expect/test21.7
+++ b/testsuite/expect/test21.7
@@ -7,7 +7,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-2010 Lawrence Livermore National Security.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
source ./globals
set test_id "21.7"
+set test_nu "test21-7"
set exit_code 0
set amatches 0
set lmatches 0
@@ -56,9 +57,9 @@ set ms MaxSubmitJobs
set mn MaxNodes
set mw MaxWall
set clu cluster
-set tc1 tcluster1
-set tc2 tcluster2
-set tc3 tcluster3
+set tc1 [format "%s%s" $test_nu "clus1"]
+set tc2 [format "%s%s" $test_nu "clus2"]
+set tc3 [format "%s%s" $test_nu "clus3"]
set fs1 2500
set gc1 50
set gj1 100
diff --git a/testsuite/expect/test21.8 b/testsuite/expect/test21.8
index 8a0aa1c0d77..ab8fa89dbe2 100755
--- a/testsuite/expect/test21.8
+++ b/testsuite/expect/test21.8
@@ -7,7 +7,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-2010 Lawrence Livermore National Security.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
source ./globals
set test_id "21.8"
+set test_nu "test21-8"
set exit_code 0
set amatches 0
set mmatches 0
@@ -57,9 +58,9 @@ set ms MaxSubmitJobs
set mn MaxNodes
set mw MaxWall
set clu cluster
-set tc1 tcluster1
-set tc2 tcluster2
-set tc3 tcluster3
+set tc1 [format "%s%s" $test_nu "clus1"]
+set tc2 [format "%s%s" $test_nu "clus2"]
+set tc3 [format "%s%s" $test_nu "clus3"]
set fs1 2500
set fs2 1375
set gc1 20
diff --git a/testsuite/expect/test21.9 b/testsuite/expect/test21.9
index 0eab41c1e3b..b117712a2dc 100755
--- a/testsuite/expect/test21.9
+++ b/testsuite/expect/test21.9
@@ -7,7 +7,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-2010 Lawrence Livermore National Security.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
@@ -33,6 +33,7 @@
source ./globals
set test_id "21.9"
+set test_nu "test21-9"
set exit_code 0
set amatches 0
set mmatches 0
@@ -57,9 +58,9 @@ set ms MaxSubmitJobs
set mn MaxNodes
set mw MaxWall
set clu cluster
-set tc1 tcluster1
-set tc2 tcluster2
-set tc3 tcluster3
+set tc1 [format "%s%s" $test_nu "clus1"]
+set tc2 [format "%s%s" $test_nu "clus2"]
+set tc3 [format "%s%s" $test_nu "clus3"]
set fs1 2500
set fs2 1375
set gc1 20
diff --git a/testsuite/expect/test22.1 b/testsuite/expect/test22.1
index fc479a8d539..900c5d676eb 100755
--- a/testsuite/expect/test22.1
+++ b/testsuite/expect/test22.1
@@ -33,7 +33,7 @@
source ./globals_accounting
set test_id "test22.1"
-set test_nu "test22n1"
+set test_nu "test22-1"
set exit_code 0
set matches 0
set not_support 0
--
GitLab