From 1537c19a8bea881983f9e830970e1df806404c9f Mon Sep 17 00:00:00 2001
From: Stephen Oxley <stephen.oxley@metoffice.gov.uk>
Date: Tue, 11 Apr 2017 17:25:58 +0100
Subject: [PATCH 1/2] Ensure OPTARG has a default value of nothing.

---
 bin/rose-mpi-launch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/rose-mpi-launch b/bin/rose-mpi-launch
index 8d967726ef..59b7d5e002 100755
--- a/bin/rose-mpi-launch
+++ b/bin/rose-mpi-launch
@@ -131,7 +131,7 @@ while (($# > 0)); do
                       err "ROSE_LAUNCHER_ULIMIT_OPTS=$ROSE_LAUNCHER_ULIMIT_OPTS"
                       :;;
                     *)
-                      ulimit -$OPT $OPTARG || err \
+                      ulimit -$OPT ${OPTARG:-} || err \
                           "ROSE_LAUNCHER_ULIMIT_OPTS=$ROSE_LAUNCHER_ULIMIT_OPTS"
                       :;;
                 esac

From 6376a134339ff102c8b544ba1707fb6deff65fe6 Mon Sep 17 00:00:00 2001
From: Stephen Oxley <stephen.oxley@metoffice.gov.uk>
Date: Tue, 11 Apr 2017 18:25:26 +0100
Subject: [PATCH 2/2] Test correction

---
 t/rose-mpi-launch/01-command-inner.t | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/t/rose-mpi-launch/01-command-inner.t b/t/rose-mpi-launch/01-command-inner.t
index 46f752da9b..974982ced6 100755
--- a/t/rose-mpi-launch/01-command-inner.t
+++ b/t/rose-mpi-launch/01-command-inner.t
@@ -34,15 +34,18 @@ file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
 # Use ROSE_LAUNCHER_ULIMIT_OPTS.
 TEST_KEY=$TEST_KEY_BASE-ulimit-good
-ULIMIT_STACK=$(ulimit -s)
-if [[ $ULIMIT_STACK == 'unlimited' ]]; then
-    ULIMIT_STACK_NEW=$ULIMIT_STACK
+ULIMIT_FILE_SIZE=$(ulimit -f)
+if [[ $ULIMIT_FILE_SIZE == 'unlimited' ]]; then
+    ULIMIT_FILE_SIZE_NEW=100000
 else
-    ULIMIT_STACK_NEW=$(($(ulimit -s) / 2))
+    ULIMIT_FILE_SIZE_NEW=$(($(ulimit -f) / 2))
 fi
-ROSE_LAUNCHER_ULIMIT_OPTS="-s $ULIMIT_STACK_NEW" \
-    run_pass "$TEST_KEY" rose mpi-launch --inner bash -c 'ulimit -s'
-file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<<$ULIMIT_STACK_NEW
+ROSE_LAUNCHER_ULIMIT_OPTS="-f $ULIMIT_FILE_SIZE_NEW -H" \
+    run_pass "$TEST_KEY" rose mpi-launch --inner bash -c 'ulimit -f'
+file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__OUT__
+$ULIMIT_FILE_SIZE_NEW
+$ULIMIT_FILE_SIZE_NEW
+__OUT__
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 #-------------------------------------------------------------------------------
 # Use bad ROSE_LAUNCHER_ULIMIT_OPTS.