From c0b0bc18fd9bf53019641142546e1110b45a7b74 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 15 Dec 2006 19:42:33 +0000
Subject: [PATCH] Disable open file test with proctrack/sgi_job.
---
testsuite/expect/test7.9 | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/testsuite/expect/test7.9 b/testsuite/expect/test7.9
index 453a8f167e2..b0f8cf4ca82 100755
--- a/testsuite/expect/test7.9
+++ b/testsuite/expect/test7.9
@@ -42,18 +42,28 @@ set iterations 50
print_header $test_id
#
-# Test is incompatible with switch/elan
+# Test is incompatible with proctrack/rms, proctrack/sgi_job, and switch/elan
+# Each leave open files, although we could clear the proctrack related files
+# by just closing all files after fd=3. Closing all files from switch/elan
+# would disable its use.
#
-set switch_elan 0
+set invalid 0
log_user 0
spawn $scontrol show config
expect {
-re "proctrack/rms" {
- set switch_elan 1
+ send_user "\nWARNING: test incompatible with proctrack/rms\n"
+ set invalid 1
+ exp_continue
+ }
+ -re "proctrack/sgi_job" {
+ send_user "\nWARNING: test incompatible with proctrack/sgi_job\n"
+ set invalid 1
exp_continue
}
-re "switch/elan" {
- set switch_elan 1
+ send_user "\nWARNING: test incompatible with switch/elan\n"
+ set invalid 1
exp_continue
}
timeout {
@@ -65,8 +75,7 @@ expect {
}
}
log_user 1
-if {$switch_elan == 1} {
- send_user "\nWARNING: not running compatible switch, this test is not applicable\n"
+if {$invalid == 1} {
exit $exit_code
}
--
GitLab