From efdf17c21746884c3fd58a9c0e88bc37ce2c008e Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Mon, 19 Nov 2012 16:24:05 -0800
Subject: [PATCH] Minor changes to testing and documentation for Cray systems
---
doc/html/cray.shtml | 8 ++++----
testsuite/expect/test1.16 | 5 +++++
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/doc/html/cray.shtml b/doc/html/cray.shtml
index 3ce3556b0b9..6818dcb29b0 100644
--- a/doc/html/cray.shtml
+++ b/doc/html/cray.shtml
@@ -181,9 +181,9 @@ minimum node count for a partition is one compute node).</p>
<h3>srun options translations on a Cray</h3>
<p>The following <i>srun</i> options are translated to these <i>aprun</i>
-options. If it isn't listed here there is no translation and while
-the option can be used for the allocation within Slurm it will not be propagated
-to <i>aprun</i>.</p>
+options. <i>srun</i> options not listed below have no equivalent <i>aprun</i>
+translation and while the option can be used for the allocation within Slurm it
+will not be propagated to <i>aprun</i>.</p>
<div id="slurmtable">
<div id="row"><div id="slurmtd"><b>srun option</b></div><div id="slurmtd"><b>aprun option</b></div></div>
<div id="row"><div id="slurmtd">-c, --cpus-per-task</div><div id="slurmtd">-d</div></div>
@@ -656,6 +656,6 @@ login: # /etc/init.d/slurm start
<p class="footer"><a href="#top">top</a></p>
-<p style="text-align:center;">Last modified 7 November 2012</p>
+<p style="text-align:center;">Last modified 19 November 2012</p>
<!--#include virtual="footer.txt"-->
diff --git a/testsuite/expect/test1.16 b/testsuite/expect/test1.16
index d24b671b704..d43c3978a82 100755
--- a/testsuite/expect/test1.16
+++ b/testsuite/expect/test1.16
@@ -40,6 +40,11 @@ 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"
+ exit $exit_code
+}
+
#
# Create a scratch file
#
--
GitLab