From 302c7073d7ea5bd35705a44b4970c63672ea24f7 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Mon, 19 Nov 2012 16:36:07 -0800
Subject: [PATCH] Disable some more tests for Cray systems

---
 testsuite/expect/test1.16 | 2 +-
 testsuite/expect/test1.6  | 3 +++
 testsuite/expect/test23.1 | 5 +++++
 testsuite/expect/test7.13 | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/testsuite/expect/test1.16 b/testsuite/expect/test1.16
index d43c3978a82..48fbae1bb00 100755
--- a/testsuite/expect/test1.16
+++ b/testsuite/expect/test1.16
@@ -41,7 +41,7 @@ set scratch_file       "scratch.$test_id"
 print_header $test_id
 
 if {[test_cray]} {
-        send_user "\nWARNING: This test is not compatible with Cray systems\n"
+        send_user "\nWARNING: This test is incompatible with Cray systems\n"
         exit $exit_code
 }
 
diff --git a/testsuite/expect/test1.6 b/testsuite/expect/test1.6
index 3cd581903ec..c25c4141fc2 100755
--- a/testsuite/expect/test1.6
+++ b/testsuite/expect/test1.6
@@ -45,6 +45,9 @@ print_header $test_id
 if {[test_launch_poe]} {
 	send_user "\nWARNING: This test is incompatible with POE systems\n"
 	exit $exit_code
+} elseif {[test_cray]} {
+        send_user "\nWARNING: This test is incompatible with Cray systems\n"
+        exit $exit_code
 }
 
 #
diff --git a/testsuite/expect/test23.1 b/testsuite/expect/test23.1
index 3c5f7e441a8..d8f548ed13b 100755
--- a/testsuite/expect/test23.1
+++ b/testsuite/expect/test23.1
@@ -39,6 +39,11 @@ set not_support 0
 
 print_header $test_id
 
+if {[test_cray]} {
+        send_user "\nWARNING: This test is incompatible with Cray systems\n"
+        exit $exit_code
+}
+
 ################################################################
 #
 # Proc: sstat_job
diff --git a/testsuite/expect/test7.13 b/testsuite/expect/test7.13
index 188ebd6f7f0..9707714bd88 100755
--- a/testsuite/expect/test7.13
+++ b/testsuite/expect/test7.13
@@ -42,6 +42,9 @@ print_header $test_id
 if {[test_launch_poe]} {
 	send_user "\nWARNING: This test is incompatible with launch/poe systems\n"
 	exit 0
+} elseif {[test_cray]} {
+        send_user "\nWARNING: This test is incompatible with Cray systems\n"
+        exit $exit_code
 }
 
 #
-- 
GitLab