From 5d1a2d9c55b859cbceddca4bbfb487e5b0dc6629 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 11 Apr 2013 14:01:31 -0700
Subject: [PATCH] Disable sbcast tests for all front-end systems (e.g. Cray)
---
testsuite/expect/globals | 4 ----
testsuite/expect/test14.1 | 7 +++----
testsuite/expect/test14.2 | 6 +++---
testsuite/expect/test14.3 | 6 +++---
4 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index 2cfa11e926c..76bef929c08 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -1171,10 +1171,6 @@ proc test_front_end { } {
set front_end 1
exp_continue
}
- "select/cray" {
- set front_end 1
- exp_continue
- }
eof {
wait
}
diff --git a/testsuite/expect/test14.1 b/testsuite/expect/test14.1
index 4149cfbe79a..821355e19ac 100755
--- a/testsuite/expect/test14.1
+++ b/testsuite/expect/test14.1
@@ -38,12 +38,11 @@ set matches 0
print_header $test_id
-if {[test_bluegene]} {
- send_user "\nWARNING: This test is incompatible with a Bluegene system\n"
- exit $exit_code
+if {[test_front_end] != 0} {
+ send_user "\nWARNING: This test is incompatible with front-end systems\n"
+ exit 0
}
-
#
# Report the sbcast usage format
#
diff --git a/testsuite/expect/test14.2 b/testsuite/expect/test14.2
index 5013e4e6ac1..aa0bc59e6ae 100755
--- a/testsuite/expect/test14.2
+++ b/testsuite/expect/test14.2
@@ -38,9 +38,9 @@ set matches 0
print_header $test_id
-if {[test_bluegene]} {
- send_user "\nWARNING: This test is incompatible with a Bluegene system\n"
- exit $exit_code
+if {[test_front_end] != 0} {
+ send_user "\nWARNING: This test is incompatible with front-end systems\n"
+ exit 0
}
#
diff --git a/testsuite/expect/test14.3 b/testsuite/expect/test14.3
index eeef3b24edd..e3a9343d7ae 100755
--- a/testsuite/expect/test14.3
+++ b/testsuite/expect/test14.3
@@ -39,9 +39,9 @@ set version 0
print_header $test_id
-if {[test_bluegene]} {
- send_user "\nWARNING: This test is incompatible with a Bluegene system\n"
- exit $exit_code
+if {[test_front_end] != 0} {
+ send_user "\nWARNING: This test is incompatible with front-end systems\n"
+ exit 0
}
#
--
GitLab