Skip to content
Snippets Groups Projects
Commit 002966c8 authored by Joseph P. Donaghy's avatar Joseph P. Donaghy
Browse files

modifying variable convention.

parent 716f98f3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
testsuite/expect/test21.10
+ 4
− 3
View file @ 002966c8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR # "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated. # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov> # Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved. # CODE-OCEC-09-009. All rights reserved.
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
source ./globals source ./globals
set test_id "21.10" set test_id "21.10"
set test_nu "test21-10"
set exit_code 0 set exit_code 0
set acmatches 0 set acmatches 0
set aamatches 0 set aamatches 0
...@@ -61,7 +62,7 @@ set ms MaxSubmitJobs ...@@ -61,7 +62,7 @@ set ms MaxSubmitJobs
set mn MaxNodes set mn MaxNodes
set mw MaxWall set mw MaxWall
set clu cluster set clu cluster
set tc1 tcluster1 set tc1 [format "%s%s" $test_nu "clus1"]
set fs1 2500 set fs1 2500
set gm1 1000 set gm1 1000
set gc1 20 set gc1 20
...@@ -77,7 +78,7 @@ set mn1 200 ...@@ -77,7 +78,7 @@ set mn1 200
set mw1 01:00:00 set mw1 01:00:00
set acc account set acc account
set ass associations set ass associations
set nm1 testaccta1 set nm1 [format "%s%s" $test_nu "acct1"]
set des Description set des Description
set ds1 "Test Account A1" set ds1 "Test Account A1"
set org Organization set org Organization
......
testsuite/expect/test21.11
+ 11
− 10
View file @ 002966c8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR # "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated. # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov> # Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved. # CODE-OCEC-09-009. All rights reserved.
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
source ./globals source ./globals
set test_id "21.11" set test_id "21.11"
set test_nu "test21-11"
set exit_code 0 set exit_code 0
set acmatches 0 set acmatches 0
set aamatches 0 set aamatches 0
...@@ -53,8 +54,8 @@ set mj MaxJobs ...@@ -53,8 +54,8 @@ set mj MaxJobs
set mn MaxNodes set mn MaxNodes
set mw MaxWall set mw MaxWall
set clu cluster set clu cluster
set tc1 tcluster1 set tc1 [format "%s%s" $test_nu "clus1"]
set tc2 tcluster2 set tc2 [format "%s%s" $test_nu "clus2"]
set fs1 2500 set fs1 2500
set mc1 1000000 set mc1 1000000
set mj1 50 set mj1 50
...@@ -62,8 +63,8 @@ set mn1 300 ...@@ -62,8 +63,8 @@ set mn1 300
set mw1 01:00:00 set mw1 01:00:00
set acc account set acc account
set ass associations set ass associations
set nm1 testaccta1 set nm1 [format "%s%s" $test_nu "acct1"]
set nm2 testaccta2 set nm2 [format "%s%s" $test_nu "acct2"]
set des Description set des Description
set ds1 "Test Account A1" set ds1 "Test Account A1"
set org Organization set org Organization
...@@ -152,22 +153,22 @@ if {$aamatches != 1} { ...@@ -152,22 +153,22 @@ if {$aamatches != 1} {
# #
# Use sacctmgr to list the test associations # 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 { expect {
-re "$tc1 *$nm1" { -re "$tc1.$nm1" {
incr almatches incr almatches
exp_continue exp_continue
} }
-re "$tc1 *$nm2" { -re "$tc1.$nm2" {
incr almatches incr almatches
exp_continue exp_continue
} }
-re "$tc2 *$nm1" { -re "$tc2.$nm1" {
set exit_code 1 set exit_code 1
send_user "\nFAILURE: $nm1 account erroneously added to $tc2\n" send_user "\nFAILURE: $nm1 account erroneously added to $tc2\n"
exp_continue exp_continue
} }
-re "$tc2 *$nm2" { -re "$tc2.$nm2" {
exp_continue exp_continue
send_user "\nFAILURE: $nm2 account erroneously added to $tc2\n" send_user "\nFAILURE: $nm2 account erroneously added to $tc2\n"
set exit_code 1 set exit_code 1
......
testsuite/expect/test21.5
+ 4
− 2
View file @ 002966c8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR # "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated. # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov> # Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved. # CODE-OCEC-09-009. All rights reserved.
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
source ./globals source ./globals
set test_id "21.5" set test_id "21.5"
set test_nu "test21-5"
set exit_code 0 set exit_code 0
set amatches 0 set amatches 0
set lmatches 0 set lmatches 0
...@@ -56,7 +57,8 @@ set ms MaxSubmitJobs ...@@ -56,7 +57,8 @@ set ms MaxSubmitJobs
set mn MaxNodes set mn MaxNodes
set mw MaxWall set mw MaxWall
set clu cluster set clu cluster
set tc1 tcluster1 set tc1 [format "%s%s" $test_nu "clus"]
#set tc1 tcluster1
set fs1 2500 set fs1 2500
set gc1 50 set gc1 50
set gj1 100 set gj1 100
......
testsuite/expect/test21.6
+ 5
− 4
View file @ 002966c8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR # "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated. # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov> # Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved. # CODE-OCEC-09-009. All rights reserved.
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
source ./globals source ./globals
set test_id "21.6" set test_id "21.6"
set test_nu "test21-6"
set exit_code 0 set exit_code 0
set amatches 0 set amatches 0
set lmatches 0 set lmatches 0
...@@ -56,9 +57,9 @@ set ms MaxSubmitJobs ...@@ -56,9 +57,9 @@ set ms MaxSubmitJobs
set mn MaxNodes set mn MaxNodes
set mw MaxWall set mw MaxWall
set clu cluster set clu cluster
set tc1 tcluster1 set tc1 [format "%s%s" $test_nu "clus1"]
set tc2 tcluster2 set tc2 [format "%s%s" $test_nu "clus2"]
set tc3 tcluster3 set tc3 [format "%s%s" $test_nu "clus3"]
set fs1 2500 set fs1 2500
set gc1 50 set gc1 50
set gj1 100 set gj1 100
......
testsuite/expect/test21.7
+ 5
− 4
View file @ 002966c8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR # "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated. # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov> # Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved. # CODE-OCEC-09-009. All rights reserved.
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
source ./globals source ./globals
set test_id "21.7" set test_id "21.7"
set test_nu "test21-7"
set exit_code 0 set exit_code 0
set amatches 0 set amatches 0
set lmatches 0 set lmatches 0
...@@ -56,9 +57,9 @@ set ms MaxSubmitJobs ...@@ -56,9 +57,9 @@ set ms MaxSubmitJobs
set mn MaxNodes set mn MaxNodes
set mw MaxWall set mw MaxWall
set clu cluster set clu cluster
set tc1 tcluster1 set tc1 [format "%s%s" $test_nu "clus1"]
set tc2 tcluster2 set tc2 [format "%s%s" $test_nu "clus2"]
set tc3 tcluster3 set tc3 [format "%s%s" $test_nu "clus3"]
set fs1 2500 set fs1 2500
set gc1 50 set gc1 50
set gj1 100 set gj1 100
......
testsuite/expect/test21.8
+ 5
− 4
View file @ 002966c8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR # "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated. # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov> # Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved. # CODE-OCEC-09-009. All rights reserved.
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
source ./globals source ./globals
set test_id "21.8" set test_id "21.8"
set test_nu "test21-8"
set exit_code 0 set exit_code 0
set amatches 0 set amatches 0
set mmatches 0 set mmatches 0
...@@ -57,9 +58,9 @@ set ms MaxSubmitJobs ...@@ -57,9 +58,9 @@ set ms MaxSubmitJobs
set mn MaxNodes set mn MaxNodes
set mw MaxWall set mw MaxWall
set clu cluster set clu cluster
set tc1 tcluster1 set tc1 [format "%s%s" $test_nu "clus1"]
set tc2 tcluster2 set tc2 [format "%s%s" $test_nu "clus2"]
set tc3 tcluster3 set tc3 [format "%s%s" $test_nu "clus3"]
set fs1 2500 set fs1 2500
set fs2 1375 set fs2 1375
set gc1 20 set gc1 20
......
testsuite/expect/test21.9
+ 5
− 4
View file @ 002966c8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR # "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated. # 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). # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Joseph Donaghy <donaghy1@llnl.gov> # Written by Joseph Donaghy <donaghy1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved. # CODE-OCEC-09-009. All rights reserved.
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
source ./globals source ./globals
set test_id "21.9" set test_id "21.9"
set test_nu "test21-9"
set exit_code 0 set exit_code 0
set amatches 0 set amatches 0
set mmatches 0 set mmatches 0
...@@ -57,9 +58,9 @@ set ms MaxSubmitJobs ...@@ -57,9 +58,9 @@ set ms MaxSubmitJobs
set mn MaxNodes set mn MaxNodes
set mw MaxWall set mw MaxWall
set clu cluster set clu cluster
set tc1 tcluster1 set tc1 [format "%s%s" $test_nu "clus1"]
set tc2 tcluster2 set tc2 [format "%s%s" $test_nu "clus2"]
set tc3 tcluster3 set tc3 [format "%s%s" $test_nu "clus3"]
set fs1 2500 set fs1 2500
set fs2 1375 set fs2 1375
set gc1 20 set gc1 20
......
testsuite/expect/test22.1
+ 1
− 1
View file @ 002966c8
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
source ./globals_accounting source ./globals_accounting
set test_id "test22.1" set test_id "test22.1"
set test_nu "test22n1" set test_nu "test22-1"
set exit_code 0 set exit_code 0
set matches 0 set matches 0
set not_support 0 set not_support 0
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung