From 3d1b1e1de3d085f09ef4537504d93c1e9a7e537e Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Mon, 25 Jul 2011 10:28:05 -0700
Subject: [PATCH] BGQ test suite updates
Update test suite for BGQ emulation. Some command output has changed
slightly. srun command only launches one task (runjob) now.
---
testsuite/expect/test1.15 | 4 ++++
testsuite/expect/test1.2 | 7 ++++++-
testsuite/expect/test1.21 | 4 ++++
testsuite/expect/test1.22 | 4 ++++
testsuite/expect/test1.33 | 4 ++++
testsuite/expect/test1.46 | 4 ++++
testsuite/expect/test1.9 | 7 ++++++-
testsuite/expect/test10.12 | 4 ++--
testsuite/expect/test17.6 | 8 +++++++-
9 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/testsuite/expect/test1.15 b/testsuite/expect/test1.15
index af438e2d8f1..598b1e01e07 100755
--- a/testsuite/expect/test1.15
+++ b/testsuite/expect/test1.15
@@ -39,6 +39,10 @@ set matches 0
print_header $test_id
+if {[test_bluegene]} {
+ send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+ exit $exit_code
+}
if {[test_cray]} {
send_user "\nWARNING: This test is incompatible with Cray systems\n"
exit $exit_code
diff --git a/testsuite/expect/test1.2 b/testsuite/expect/test1.2
index 7dacc252359..2d3cb29c3c7 100755
--- a/testsuite/expect/test1.2
+++ b/testsuite/expect/test1.2
@@ -35,12 +35,17 @@ source ./globals
set test_id "1.2"
set exit_code 0
-set task_cnt 10
set tasks 0
print_header $test_id
# if the srun --overcommit option worked this test would work.
+if {[test_bluegene]} {
+ # We never launch more than one task on emulated Bluegene
+ set task_cnt 1
+} else {
+ set task_cnt 10
+}
if {[test_cray]} {
send_user "\nWARNING: This test is incompatible with Cray systems\n"
exit $exit_code
diff --git a/testsuite/expect/test1.21 b/testsuite/expect/test1.21
index 554cc671909..fd3564b2ae5 100755
--- a/testsuite/expect/test1.21
+++ b/testsuite/expect/test1.21
@@ -45,6 +45,10 @@ if {[test_cray]} {
send_user "\nWARNING: This test is incompatible with Cray systems\n"
exit $exit_code
}
+if {[test_bluegene]} {
+ send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+ exit $exit_code
+}
#
# Spawn a shell via srun with stdout forwarding disabled
diff --git a/testsuite/expect/test1.22 b/testsuite/expect/test1.22
index 7a55f132336..a4a7c7b010f 100755
--- a/testsuite/expect/test1.22
+++ b/testsuite/expect/test1.22
@@ -39,6 +39,10 @@ set exit_code 0
print_header $test_id
+if {[test_bluegene]} {
+ send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+ exit $exit_code
+}
if {[test_cray]} {
send_user "\nWARNING: This test is incompatible with Cray systems\n"
exit $exit_code
diff --git a/testsuite/expect/test1.33 b/testsuite/expect/test1.33
index 3f64a4382be..f6aedc47e8a 100755
--- a/testsuite/expect/test1.33
+++ b/testsuite/expect/test1.33
@@ -39,6 +39,10 @@ set test_script "./test$test_id.bash"
print_header $test_id
+if {[test_bluegene]} {
+ send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+ exit $exit_code
+}
if {[test_cray]} {
send_user "\nWARNING: This test is incompatible with Cray systems\n"
exit $exit_code
diff --git a/testsuite/expect/test1.46 b/testsuite/expect/test1.46
index b94d217f8c0..d556c40ab03 100755
--- a/testsuite/expect/test1.46
+++ b/testsuite/expect/test1.46
@@ -39,6 +39,10 @@ set matches 0
print_header $test_id
+if {[test_bluegene]} {
+ send_user "\nWARNING: This test is incompatible with Bluegene systems\n"
+ exit $exit_code
+}
if {[test_cray]} {
send_user "\nWARNING: This test is incompatible with Cray systems\n"
exit $exit_code
diff --git a/testsuite/expect/test1.9 b/testsuite/expect/test1.9
index 78031d65878..639bd973812 100755
--- a/testsuite/expect/test1.9
+++ b/testsuite/expect/test1.9
@@ -34,12 +34,17 @@ source ./globals
set test_id "1.9"
set exit_code 0
-set task_cnt 5
set tasks 0
set verbosity 0
print_header $test_id
+if {[test_bluegene]} {
+ # We never launch more than one task on emulated Bluegene
+ set task_cnt 1
+} else {
+ set task_cnt 5
+}
if {[test_cray]} {
send_user "\nWARNING: This test is incompatible with Cray systems\n"
exit $exit_code
diff --git a/testsuite/expect/test10.12 b/testsuite/expect/test10.12
index 1283f2adbb3..e14d966a427 100755
--- a/testsuite/expect/test10.12
+++ b/testsuite/expect/test10.12
@@ -54,7 +54,7 @@ if {[file exists $smap] == 0} {
#
spawn $smap --resolve 000
expect {
- -re "Must be physically on a BG" {
+ -re "Must be physically on a BlueGene" {
set non_bg 1
exp_continue;
}
@@ -72,7 +72,7 @@ expect {
}
}
if {$non_bg != 0} {
- send_user "\nWARNING: This test is only valid on a Blue Gene system Service Node\n"
+ send_user "\nWARNING: This test is only valid on a BlueGene system Service Node\n"
exit 0
}
if {$check != 1} {
diff --git a/testsuite/expect/test17.6 b/testsuite/expect/test17.6
index 638b8843840..2b5705bc56d 100755
--- a/testsuite/expect/test17.6
+++ b/testsuite/expect/test17.6
@@ -37,11 +37,17 @@ set test_id "17.6"
set exit_code 0
set file_in "test$test_id.input"
set file_out "test$test_id.output"
-set task_cnt 2
set tasks 0
print_header $test_id
+if {[test_bluegene]} {
+ # We never launch more than one task on emulated Bluegene
+ set task_cnt 1
+} else {
+ set task_cnt 2
+}
+
#
# Submit a slurm job that will execute 'id' on $task_cnt tasks (or try anyway)
#
--
GitLab