Fix bug in cli options

Author: ekouts

reframe/core/schedulers/slurm.py

@@ -7,6 +7,7 @@
 import glob
 import itertools
 import re
+import shlex
 import time
 from argparse import ArgumentParser
 from contextlib import suppress
@@ -305,6 +306,8 @@ def filternodes(self, job, nodes):
         # create a mutable list out of the immutable SequenceView that
         # sched_access is
         options = job.sched_access + job.options + job.cli_options
+        options = list(itertools.chain.from_iterable(shlex.split(m)
+                                                     for m in options))
         option_parser = ArgumentParser()
         option_parser.add_argument('--reservation')
         option_parser.add_argument('-p', '--partition')

reframe/frontend/cli.py

@@ -1037,6 +1037,14 @@ def _case_failed(t):
 
         if options.distribute:
             node_map = getallnodes(options.distribute, parsed_job_options)
+            # In the distribute option we need to remove the cli options that
+            # begin with '--nodelist' and '-w', so that we don't include them
+            # in the job scripts
+            parsed_job_options = list(
+                filter(lambda x: (not x.startswith('-w') and
+                                  not x.startswith('--nodelist')),
+                       parsed_job_options)
+            )
             testcases = distribute_tests(testcases, node_map)
             testcases_all = testcases