From 18c966f0da228d194b9beccab8dfe006d2247cc8 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 24 May 2012 12:30:41 -0700
Subject: [PATCH] Modify tests for select/serial plugin
---
testsuite/expect/test1.88 | 8 +++++---
testsuite/expect/test1.95 | 9 +++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/testsuite/expect/test1.88 b/testsuite/expect/test1.88
index 0419555e140..90da1a4337f 100755
--- a/testsuite/expect/test1.88
+++ b/testsuite/expect/test1.88
@@ -54,13 +54,15 @@ if {[file executable $mpicc] == 0} {
send_user "\nWARNING: $mpicc does not exists\n"
exit 0
}
-if {[test_front_end] != 0} {
+if {[test_front_end]} {
send_user "\nWARNING: This test is incompatible with front-end systems\n"
exit 0
-}
-if {[test_aix] == 1} {
+} elseif {[test_aix]} {
send_user "WARNING: Test is incompatible with AIX\n"
exit 0
+} elseif {[test_serial]} {
+ send_user "WARNING: Test is incompatible with serial system\n"
+ exit 0
}
#
diff --git a/testsuite/expect/test1.95 b/testsuite/expect/test1.95
index 2ff01966437..93aab08cfa3 100755
--- a/testsuite/expect/test1.95
+++ b/testsuite/expect/test1.95
@@ -53,13 +53,15 @@ if {[file executable $upcc] == 0} {
send_user "\nWARNING: $upcc does not exists\n"
exit 0
}
-if {[test_front_end] != 0} {
+if {[test_front_end]} {
send_user "\nWARNING: This test is incompatible with front-end systems\n"
exit 0
-}
-if {[test_aix] == 1} {
+} elseif {[test_aix]} {
send_user "WARNING: Test is incompatible with AIX\n"
exit 0
+} elseif {[test_serial]} {
+ send_user "WARNING: Test is incompatible with serial system\n"
+ exit 0
}
#
@@ -68,7 +70,6 @@ if {[test_aix] == 1} {
exec $bin_rm -f $test_prog ${test_prog}.o
exec $upcc -o $test_prog ${test_prog}.upc
-
# Delete left-over stdout/err files
file delete $file_out $file_err
--
GitLab