Merge pull request #1197 from steoxley/task_comma_sep

rose stem: allow comma separated --task --group
metomi · Apr 1, 2014 · abbe15f · abbe15f
2 parents f11f5d2 + 2385dc1
commit abbe15f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/bin/rose-stem b/bin/rose-stem
@@ -42,11 +42,11 @@
 #         fcm-make config files are taken from it. Further source trees can be
 #         added with additional --source arguments.
 #         Defaults to '.' if not specified.
-#     --group=GROUP, -g GROUP
+#     --group=GROUP[,GROUP2[,...]], -g GROUP[,GROUP2[,...]]
 #         Specify a group name to run. Additional groups can be specified
 #         with further --group arguments. The suite will then convert the groups
 #         into a series of tasks to run..
-#     --task=GROUP, -t GROUP
+#     --task=TASK[,TASK2[,...]], -t TASK[,TASK2[,...]]
 #         Synonym for --group.
 #
 # JINJA2 VARIABLES

diff --git a/doc/rose-command.html b/doc/rose-command.html
@@ -1385,13 +1385,13 @@ <h3>OPTIONS</h3>All options of <a href="#rose-suite-run">rose suite-run</a>
       can be added with additional --source arguments. Defaults to '.' if not
       specified.</dd>
 
-      <dt><kbd>--group=GROUP, -g GROUP</kbd></dt>
+      <dt><kbd>--group=GROUP[,GROUP2[,...]], -g GROUP[,GROUP2[,...]]</kbd></dt>
 
       <dd>Specify a group name to run. Additional groups can be specified with
       further --group arguments. The suite will then convert the groups into a
       series of tasks to run.</dd>
 
-      <dt><kbd>--task=GROUP, -t GROUP</kbd></dt>
+      <dt><kbd>--task=TASK[,TASK2[,...]], -t TASK[,TASK2[,...]]</kbd></dt>
 
       <dd>Synonym for --group.</dd>
     </dl>

diff --git a/lib/python/rose/stem.py b/lib/python/rose/stem.py
@@ -294,8 +294,11 @@ def process(self):
         if self.opts.group:
             if not self.opts.defines:
                 self.opts.defines = []
+            expanded_groups = []
+            for i in self.opts.group:
+                expanded_groups.extend(i.split(','))
             self.opts.defines.append(SUITE_RC_PREFIX + 'RUN_NAMES=' +
-                                     str(self.opts.group))
+                                     str(expanded_groups))
 
         # Change into the suite directory
         if self.opts.conf_dir:

diff --git a/t/rose-stem/00-run-basic.t b/t/rose-stem/00-run-basic.t
@@ -59,12 +59,14 @@ tests $N_TESTS
 #Test for successful execution
 TEST_KEY=$TEST_KEY_BASE-basic-check
 run_pass "$TEST_KEY" \
-   rose stem --group=earl_grey --source=$WORKINGCOPY --source=fcm:foo_tr@head \
-             --no-gcontrol --name $SUITENAME -- --debug
+   rose stem --group=earl_grey --task=milk,sugar --group=spoon,cup,milk \
+             --source=$WORKINGCOPY --source=fcm:foo_tr@head --no-gcontrol \
+             --name $SUITENAME -- --debug
 #Test output
 OUTPUT=$HOME/cylc-run/$SUITENAME/log/job/my_task_1.1.1.out
 TEST_KEY=$TEST_KEY_BASE-basic-groups-to-run
-file_grep $TEST_KEY "RUN_NAMES=\[earl_grey\]" $OUTPUT
+file_grep $TEST_KEY "RUN_NAMES=\[earl_grey, milk, sugar, spoon, cup, milk\]" \
+          $OUTPUT
 TEST_KEY=$TEST_KEY_BASE-basic-source
 file_grep $TEST_KEY "SOURCE_FOO=$WORKINGCOPY fcm:foo_tr@head" $OUTPUT
 TEST_KEY=$TEST_KEY_BASE-basic-source-base