Skip to content
Snippets Groups Projects
Commit e40dd183 authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Merge branch 'slurm-16.05' into slurm-17.02

parents 17083eb6 cdcffc23
No related branches found
No related tags found
No related merge requests found
...@@ -59,7 +59,7 @@ Waittime=0 ...@@ -59,7 +59,7 @@ Waittime=0
# SCHEDULING # SCHEDULING
SchedulerType=sched/backfill SchedulerType=sched/backfill
#SchedulerAuth= #SchedulerAuth=
SelectType=select/linear #SelectType=select/linear
FastSchedule=1 FastSchedule=1
#PriorityType=priority/multifactor #PriorityType=priority/multifactor
#PriorityDecayHalfLife=14-0 #PriorityDecayHalfLife=14-0
...@@ -90,4 +90,4 @@ JobCompType=jobcomp/none ...@@ -90,4 +90,4 @@ JobCompType=jobcomp/none
# #
# COMPUTE NODES # COMPUTE NODES
NodeName=linux[1-32] Procs=1 State=UNKNOWN NodeName=linux[1-32] Procs=1 State=UNKNOWN
PartitionName=debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP
...@@ -59,6 +59,7 @@ def main(argv=None): ...@@ -59,6 +59,7 @@ def main(argv=None):
action='callback', callback=test_parser, action='callback', callback=test_parser,
help='comma or space separated string of tests to include') help='comma or space separated string of tests to include')
parser.add_option('-k', '--keep-logs', action='store_true', default=False) parser.add_option('-k', '--keep-logs', action='store_true', default=False)
parser.add_option('-s', '--stop-on-first-fail', action='store_true', default=False)
(options, args) = parser.parse_args(args=argv) (options, args) = parser.parse_args(args=argv)
# Sanity check # Sanity check
...@@ -130,6 +131,8 @@ def main(argv=None): ...@@ -130,6 +131,8 @@ def main(argv=None):
failed_tests.append(test) failed_tests.append(test)
os.rename(testlog_name, testlog_name+'.failed') os.rename(testlog_name, testlog_name+'.failed')
sys.stdout.write('FAILED!\n') sys.stdout.write('FAILED!\n')
if options.stop_on_first_fail:
break
sys.stdout.flush() sys.stdout.flush()
end_time = time.time() end_time = time.time()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment