Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update testreporter and change hobart queue to medium. #1610

Merged
merged 1 commit into from
May 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/cesm/machines/config_batch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@
<directive default="/bin/bash" > -S {{ shell }} </directive>
</directives>
<queues>
<queue walltimemax="02:00:00" jobmin="1" jobmax="192" default="true">short</queue>
<queue walltimemax="02:00:00" jobmin="1" jobmax="192" >short</queue>
<queue walltimemax="06:00:00" jobmin="1" jobmax="192" default="true">medium</queue>
<queue walltimemax="40:00:00" jobmin="1" jobmax="144" >long</queue>
</queues>
</batch_system>
Expand Down
22 changes: 20 additions & 2 deletions scripts/Tools/testreporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,31 @@ def get_testreporter_xml(testroot, testid, tagname, testtype):
if line[0:4] == "FAIL":
test_status['COMMENT']+="Hybrid fail! "
break
if "COMPARE_base_multiinst" in line:
test_status['STATUS']=line[0:4]
if line[0:4] == "FAIL":
test_status['COMMENT']+="Multi instance fail! "
break
if "COMPARE_base_test" in line:
test_status['STATUS']=line[0:4]
if line[0:4] == "FAIL":
test_status['COMMENT']+="Base test fail! "
break
if "COMPARE_base_single_thread" in line:
test_status['STATUS']=line[0:4]
if line[0:4] == "FAIL":
test_status['COMMENT']+="Thread test fail! "
break

#
# Do not include time comments. Just a preference to have cleaner comments in the test database
#
try:
if 'time=' not in line:
test_status['COMMENT']+=line.split(' ',3)[3]+' '
if 'time=' not in line and 'GENERATE' not in line:
if 'BASELINE' not in line:
test_status['COMMENT']+=line.split(' ',3)[3]+' '
else:
test_status['COMMENT']+=line.split(' ',4)[4]+' '
except:
pass

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.